From a65c0b8aa17d23b392d812c6624af804279fe614 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Feb 2015 17:31:36 +0100 Subject: [PATCH] re-do org selector styles --- app/styles/app/components/dropdown.sass | 106 ++++++++--------------- app/styles/app/components/icons.sass | 12 ++- app/styles/app/components/section.sass | 4 +- app/styles/app/layouts/dashboard.sass | 73 ---------------- app/styles/app/top.sass | 2 +- app/templates/dashboard/repositories.hbs | 38 +++----- 6 files changed, 62 insertions(+), 173 deletions(-) diff --git a/app/styles/app/components/dropdown.sass b/app/styles/app/components/dropdown.sass index b9ae6ea9..8af734d9 100644 --- a/app/styles/app/components/dropdown.sass +++ b/app/styles/app/components/dropdown.sass @@ -39,75 +39,45 @@ $dropdown-border: #C3D9DB /* * Dashboard Organizations Dropdown */ +.filter + position: relative + img + max-width: 20px + max-height: 20px + margin-right: .5em + margin-top: -0.1em + border-radius: 50% + overflow: hidden -.current-org-avatar - display : inline-block - height : 20px - width : 20px - vertical-align: top - margin : -5px 5px 0 0 +.filter--org + float: left -.dropdown--org - float : left +.filter-current + padding: .9em 0 + cursor: pointer -.dropdown--org ul - text-align : left - display : inline - margin : 0 - padding : 0 - list-style : none - z-index : 1000 +.filter-dropdown + @include resetul + position: absolute + top: 3em + min-width: 12em + background-color: $white + border-radius: 4px + overflow: hidden + box-shadow: 2px 1px 4px 0px rgba(148,145,138,0.4) + z-index: 40 + display: none + a + display: inline-block + width: 100% + padding: 10px 10px 10px 20px + &:hover + color: $white + background : #5e869a + .is-selected + a + font-weight: 600 -.dropdown--org ul li - background : $white - position : relative - display : inline-block - padding : 10px 0 10px 0 - margin-right : -4px - margin-top : 0 - cursor : pointer - border-radius : 0px - -.dropdown--org li.filters-start:hover - background-color : #fff - -.dropdown--org ul li ul - padding : 0 - position : absolute - top : 35px - left : 0 - width : 200px - display : none - opacity : 0 - visibility : hidden - box-shadow : 2px 1px 4px 0px rgba(148,145,138,0.4) - -.dropdown--org ul li ul li - display : block - line-height : 23px - padding-left : 20px - -.dropdown--org ul li ul li:first-child - border-top-left-radius : 4px - border-top-right-radius : 4px - -.dropdown--org ul li ul li:last-child - border-bottom-left-radius : 4px - border-bottom-right-radius : 4px - -.dropdown--org ul li ul li div - display : inline-block - width : 20px - height : 20px - margin-right : 5px - text-indent : -9999px - border-radius : 100px - -.dropdown--org ul li ul li:hover - background : #5e869a - color : $white - -.dropdown--org ul li:hover ul - display : block - opacity : 1 - visibility : visible +.filter-current:hover ~ .filter-dropdown, +.filter-dropdown:hover + display: block diff --git a/app/styles/app/components/icons.sass b/app/styles/app/components/icons.sass index 37b98f8f..0ebfdc3f 100644 --- a/app/styles/app/components/icons.sass +++ b/app/styles/app/components/icons.sass @@ -40,4 +40,14 @@ .icon-burger background-image: inline-image('dashboard/burger.svg') &:hover - background-image: inline-image('dashboard/burger-hover.svg') \ No newline at end of file + background-image: inline-image('dashboard/burger-hover.svg') + +.icon-arrow-down + width : 0 + height : 0 + display : inline-block + padding-top : 2px + margin-left : 5px + border-left : 5px solid transparent + border-right : 5px solid transparent + border-top : 5px solid $dashboard-text-color \ No newline at end of file diff --git a/app/styles/app/components/section.sass b/app/styles/app/components/section.sass index 8a751376..5e7a96d7 100644 --- a/app/styles/app/components/section.sass +++ b/app/styles/app/components/section.sass @@ -1,10 +1,8 @@ .section font-size: $font-size-normal - padding: .65em 0 0 .section--white background-color: $white .section--maxheight - min-height: 3.3rem - max-height: 4rem \ No newline at end of file + height: 3.3em \ No newline at end of file diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass index b80404a9..19cb45bd 100644 --- a/app/styles/app/layouts/dashboard.sass +++ b/app/styles/app/layouts/dashboard.sass @@ -213,76 +213,3 @@ $db-text-color: #ACAAAA h2, h3, p, button, .db-status opacity: .7 -// #views -// float : left - -// #views ul -// text-align : left -// display : inline -// margin : 0 -// padding : 0 -// list-style : none -// z-index : 1000 - -// #views ul li -// background : $white -// position : relative -// display : inline-block -// padding : 10px 0 10px 0 -// margin-right : -4px -// margin-top : 0 -// cursor : pointer -// border-radius : 0px -// -webkit-border-radius : 0px -// -moz-border-radius : 0px - -// #views li.views-start:hover -// background-color : #fff - -// #views ul li ul -// padding : 0 -// position : absolute -// top : 35px -// left : 0 -// width : 200px -// display : none -// opacity : 0 -// visibility : hidden -// box-shadow : 2px 1px 4px 0px rgba(148,145,138,0.4) - -// #views ul li ul li -// display : block -// line-height : 23px -// padding-left : 20px - -// #views ul li ul li:first-child -// border-top-left-radius : 4px -// border-top-right-radius : 4px - -// #views ul li ul li:last-child -// border-bottom-left-radius : 4px -// border-bottom-right-radius : 4px - -// #views ul li ul li:hover -// background : #5e869a -// color : $white - -// #views ul li:hover ul -// display : block -// opacity : 1 -// visibility : visible - -// .currently-selected -// font-weight : 600 - -// .arrow-down -// width : 0 -// height : 0 -// display : inline-block -// padding-top : 2px -// margin-left : 5px -// border-left : 5px solid transparent -// border-right : 5px solid transparent -// border-top : 5px solid $dashboard-text-color - - diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index e5adb971..f061fd8c 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -174,4 +174,4 @@ $top-height: 55px outline: none !important @include clearfix &:hover - cursor: pointer \ No newline at end of file + cursor: pointer diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs index 532cad29..cc904529 100644 --- a/app/templates/dashboard/repositories.hbs +++ b/app/templates/dashboard/repositories.hbs @@ -1,32 +1,16 @@ -
+
-
-
    -
  • -
    Travis CI
    -
      -
    • All organizations
      • -
    • Travis CI
      Travis CI
      • -
    • Justine Arreche
      Justine Arreche
      • -
    • Open Karma
      Open Karma
      • -
    • eurucamp
      eurucamp
      • -
    -
    • -
+
+
+ something else +
+
-{{!--
-
    -
  • - View all repos
    -
      -
    • View all repos
      • -
    • Queued builds
      • -
    • Failed builds
      • -
    • Passed builds
      • -
    -
    • -
-
--}}
{{filter-input placeholder="Search all repositories" class="search-field" action="updateFilter" on="key-up"}}