Просмотр исходного кода

Refactor stylesheets using STYLUS

soyjavi 13 лет назад
Родитель
Сommit
7456be355f

+ 6 - 1
kitchen-sink/app/asides/features.html

@@ -1,5 +1,10 @@
 <aside id="features" class="left">
-    <header data-title="Features"></header>
+    <header data-title="Features">
+        <nav class="right box">
+            <a href="#" class="buttons" data-icon="settings"></a>
+        </nav>
+    </header>
+
     <article class="list scroll">
         <ul>
             <!-- Basic Layout -->

+ 6 - 6
kitchen-sink/app/sections/list.html

@@ -122,16 +122,16 @@
             </li>
 
             <li class="anchor">With colours</li>
-            <li class="blue">
-                <strong>&lt;li .blue&gt; + &lt;strong&gt; </strong>
+            <li class="accept">
+                <strong>&lt;li .accept&gt; + &lt;strong&gt; </strong>
                 <small>&lt;small&gt;</small>
             </li>
-            <li class="green">
-                <strong>&lt;li .green&gt; + &lt;strong&gt; </strong>
+            <li class="cancel">
+                <strong>&lt;li .cancel&gt; + &lt;strong&gt; </strong>
                 <small>&lt;small&gt;</small>
             </li>
-            <li class="yellow">
-                <strong>&lt;li .yellow&gt; + &lt;strong&gt; </strong>
+            <li class="secondary">
+                <strong>&lt;li .secondary&gt; + &lt;strong&gt; </strong>
                 <small>&lt;small&gt;</small>
             </li>
         </ul>

+ 1 - 1
kitchen-sink/index.html

@@ -64,7 +64,7 @@
     <link rel="stylesheet" href="../src/stylesheets/css/Lungo.theme.default.css">
 
     <!-- App Stylesheet -->
-    <link rel="stylesheet" href="-stylesheets/app.css">
+    <link rel="stylesheet" href="stylesheets/app.css">
 </head>
 
 <body class="app">

+ 0 - 2
kitchen-sink/stylesheets/app.css

@@ -3,8 +3,6 @@
 }
 
 #main article li.feature strong {
-    margin-top: 8px;
-    margin-bottom: 10px;
     display: block;
 }
 

+ 1 - 1
src/attributes/Lungo.Attributes.Data.js

@@ -50,7 +50,7 @@ Lungo.Attributes.Data = {
     },
     Title: {
         tag: 'title',
-        selector: 'header, footer, article',
+        selector: 'header',
         html: '<span class="title centered">{{value}}</span>'
     },
     Loading: {

+ 3 - 3
src/stylesheets/Lungo.layout.nav.styl

@@ -13,13 +13,13 @@
 nav
   &.groupbar, footer &
     display-box()
-    box-pack( justify )
+    box-pack(justify)
     & > a
-      box-flex( 1 )
+      box-flex(1)
 
   header &
     & a
-      padding: 0px 12px !important
+      padding: 0px 10px !important
       z-index: 1000
       float: left
 

+ 163 - 189
src/stylesheets/Lungo.theme.default.styl

@@ -8,207 +8,209 @@
  */
 
 @import "import/vendor.styl"
-@import url("http://fonts.googleapis.com/css?family=Titillium+Web:200,400,700")
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700")
-
-
-
-THEME         = #0093D5
-THEME_lighten = lighten(THEME, 15%)
-THEME_darken  = darken(THEME, 15%)
-
-DARK          = #222
-DARK_lighten = lighten(DARK, 25%)
-DARK_darken  = darken(DARK, 25%)
-
-
-
-THEME_dark = #222
-THEME_dark_current = #111
-THEME_dark_nav = #888
-THEME_dark_nav_active = #fff
-THEME_contrast = #444
-ASIDE_COLOR = #191919
+// @import url("http://fonts.googleapis.com/css?family=Titillium+Web:200,400,700")
+// @import url("http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700")
+
+WHITE = white
+
+/* -------------------------- THEME -------------------------- */
+CONTENT         = #f4f5f5
+COLOR_secondary = #BFBFBF
+COLOR_cancel    = #EE6557
+COLOR_accept    = #3FB58E
+DARK            = #222
+DARK_light      = lighten(DARK, 25%)
+DARK_dark       = darken(DARK, 15%)
+DARK_darkest    = darken(DARK, 30%)
+LIST_color      = #333
+LIST_color_2nd  = lighten(LIST_color, 35%)
+LIST_border     = lighten(LIST_color, 90%)
+NAV_LINK        = #888
+NAV_LINK_ACTIVE = WHITE
+THEME           = #0093D5
+THEME_light     = lighten(THEME, 15%)
+THEME_dark      = darken(THEME, 15%)
+//?
 COLOR = #484a49
-NOTIFICATION_error = #e33100
-NOTIFICATION_alert = #ffb515
-NOTIFICATION_success = #009600
 FORM_border_radius = 1px
 
 
-/* COLORS */
-COLOR_SECONDARY = #ccc
-COLOR_CANCEL    = #e33100
-COLOR_ACCEPT    = #009600
-COLOR_THEME     = #237fd7
-
-
-
 body
-  background: #000
-  font-family: "Open Sans", "Titillium Web",  Helvetica, Arial, sans-serif
+  background-color: DARK
+  font-family: "Helvetica Neue", "Open Sans", "Titillium Web",  Helvetica, Arial, sans-serif
   font-weight: 400
   font-size: 13px
   line-height: 1.3em
   letter-spacing: -0.05em
 
-
-
-
 .theme
   &, li&, a&
-    background:
-      THEME-light
+    background-color: THEME-light
     &:active
-      background: THEME
-
+      background-color: THEME
 
 [data-control="pull"]
     color: #666
     text-shadow: 0 1px 0 white
 
 
+/* -------------------------- LAYOUT COLORS -------------------------- */
 section
   & > header
     background-color: THEME
-    box-shadow 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 THEME_lighten, inset 0 -1px 0 THEME_darken
-    & .title
-      color: #fff
-
-  & > footer
-    background-color: THEME-dark
-    box-shadow inset 0 3px 0 #333
-    & > nav a
-      box-shadow 1px 0 0 #151515
-      &.current
-        color:  THEME_dark_nav_active
-        background: THEME_dark_current
-        box-shadow -1px 0 0 #252525, 1px 0 0 #252525, inset 0 3px 0 THEME
-
+    box-shadow 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 THEME_light, inset 0 -1px 0 THEME_dark
+    color: #fff
+  & > footer, & nav.groupbar
+    background-color: DARK
+    box-shadow inset 0 3px 0 DARK_dark
   & > article, & > [data-control="pull"]
-    background: #f4f5f5
-    // background-color: #ddd
-
+    background-color: CONTENT
+    &.splash
+      background: THEME
+      color: #fff
   &.aside
-    box-shadow -1px 0 0 rgba(0,0,0,0.2)
+    box-shadow -1px 0 2px rgba(0,0,0,0.2)
     &.right
-      box-shadow 4px 0 8px rgba(0,0,0,0.5)
-
+      box-shadow 1px 0 2px rgba(0,0,0,0.2)
 
+DARKEST = darken(DARK_darkest, 15%)
 aside
+  background-color: DARK_dark
   color: #fff
-  background: ASIDE_COLOR
-
-  & header, footer
-    background: THEME_dark_current
-    text-shadow: none
-  & header
-    box-shadow inset 0 -1px 0 rgba(0,0,0,0.2)
-  & article
-    background: none
-  & nav a
-    &.current .icon
-      color: white
-    &:not(.current) .icon
-      color: THEME_dark_nav
-
-  & .list li
-    background: none
-    border-bottom-color: THEME_dark !important
-
-    &.current
-      background: THEME
-      border-bottom-color: THEME
-      & strong, & small, & .icon
-        color: #fff
-
-    & strong
-      color: #999
-    & small, .icon
-      color: #666
-
-
-header nav
-  & a
-    color: #fff
+  & > header, > footer
+    background-color: DARK_darkest
+  & > header
+    box-shadow 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 DARK, inset 0 -1px 0 DARKEST
 
-  &.box
-    &:not(.right) a
-      box-shadow 1px 0 0 THEME_lighten, inset -1px 0 0 THEME_darken
-    &.right a
-      box-shadow -1px 0 0 THEME_lighten, inset 1px 0 0 THEME_darken
-    & a:active
-      background: rgba(0,0,0,0.1)
 
+/* -------------------------- NAVIGATION -------------------------- */
+nav
+  section > header > &
+    & a
+      color: #fff
+    &.box
+      &:not(.right) a
+        box-shadow 1px 0 0 THEME_light, inset -1px 0 0 THEME_dark
+      &.right a
+        box-shadow -1px 0 0 THEME_light, inset 1px 0 0 THEME_dark
+      & a:active
+        background: THEME_dark
 
-section > nav.groupbar
-  background-color: THEME_dark
-  & > a.current
+  section > &.groupbar > a.current
     box-shadow inset 0 -3px 0 THEME
 
+  section > footer > & > a, &.groupbar > a
+    color: NAV_LINK
+    &.current
+      color: NAV_LINK_ACTIVE
 
-footer > nav > a, nav.groupbar > a
-  color: THEME_dark_nav
-  &.current
-    color: THEME_dark_nav_active
-
-
-
-LIST-border = #e5e5e5
-LIST-color = #111
-LIST-color-secondary = #555
-
+  section > footer > & > a
+    box-shadow 1px 0 0 DARK_dark
+    &.current
+      color:  NAV_LINK_ACTIVE
+      background-color: DARK_dark
+      box-shadow inset 0 3px 0 THEME
+
+  aside &
+    & a
+      &.current .icon
+        color: white
+      &:not(.current) .icon
+        color: NAV_LINK
+    &.box
+      &:not(.right) a
+        box-shadow 1px 0 0 DARK, inset -1px 0 0 DARKEST
+      &.right a
+        box-shadow -1px 0 0 DARK, inset 1px 0 0 DARKEST
+      & a:active
+        background: DARKEST
+
+
+/* -------------------------- LISTS -------------------------- */
 .list
-  & li
+  section & li
     background: #fff
-    border-bottom: inset 1px LIST-border
-
+    &:not(.anchor)
+      border-bottom: inset 1px LIST_border
     &.secondary
-      box-shadow: inset 4px 0px 0px COLOR_SECONDARY
+      box-shadow: inset 4px 0px 0px COLOR_secondary
     &.accept
-      box-shadow: inset 4px 0px 0px COLOR_ACCEPT
+      box-shadow: inset 4px 0px 0px COLOR_accept
     &.cancel
-      box-shadow: inset 4px 0px 0px COLOR_CANCEL
-
+      box-shadow: inset 4px 0px 0px COLOR_cancel
     &, & a
-      color: LIST-color
-
+      color: LIST_color
+      &.anchor
+        background: DARK
       &.dark
-        background: THEME_contrast
-        &, & a
-          color: #fff
-
-      &.selectable:active, &.theme
-        background: THEME_lighten
-        &, & a
-          color: #fff
-
+        background: DARK_light
+      &.selectable:active, &.theme, &.active
+        background: THEME_light
       &.light
-        background:  LIST-border
-        text-shadow: 0 1px 0 #eee
-        &, & a
-          color: THEME_dark_nav
-
-      &.anchor
-        background: THEME_dark
-        border-bottom: none
-        &, & a
-          color: #fff !important
-
+        background:  LIST_border
+        color: LIST_color_2nd
+      &.dark, &.selectable:active, &.theme, &.anchor
+        &, small, & .right:not(.tag)
+          color: #fff
       & small, & .right:not(.tag)
-        color: LIST-color-secondary
+        color: LIST_color_2nd
 
   &:not(.indented) li
     &.dark, &.theme, &.light
       border-bottom-color: rgba(0,0,0,0.1)
 
-.splash
-  background: THEME-dark
+  aside & li
+    background: none
+    border-bottom-color: DARK
+    &.current
+      background: THEME
+      border-bottom-color: transparent
+      & strong, & small, & .icon
+        color: #fff
+    & strong
+      color: #999
+    & small, .icon
+      color: #666
+
+
+/* -------------------------- TAG -------------------------- */
+.tag
+  color: #fff
+  border-radius 2px
+  font-weight: 400 !important
+  &.count
+    background: THEME
+  header .count
+    background: THEME-dark !important
+  footer &
+    box-shadow inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5)
+  article .list &
+    box-shadow inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3)
+
+
+/* -------------------------- NOTIFICATION -------------------------- */
+.notification
   color: #fff
-  text-shadow: 0 1px 0px rgba(0,0,0,0.2)
+  & .window
+    &.confirm
+      background: #333
+    &.notify
+      text-shadow: 0 1px 0px rgba(0,0,0,0.1)
+      .box-shadow( inset 0 1px 0 rgba(255,255,255,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), 0px 1px 2px rgba(0,0,0,0.25) )
+      &.error
+        background: COLOR_cancel
+      &.alert
+        background: COLOR_secondary
+      &.success
+        background: COLOR_accept
+    &.url
+      & .close
+        background: #000
+        border: solid 2px #fff
+        box-shadow: 0 0 4px black
 
 
-/* ____________________ BUTTONS ____________________ */
+/* -------------------------- BUTTONS -------------------------- */
 a.button, button
   border-radius(FORM-border-radius)
   color: white
@@ -226,13 +228,18 @@ a.button, button
 
 button, .button, .tag
   &
-    background-color: THEME_darken
+    background-color: THEME_dark
   &.secondary
-    background-color: COLOR_SECONDARY
+    background-color: COLOR_secondary
   &.accept
-    background-color: COLOR_ACCEPT
+    background-color: COLOR_accept
   &.cancel
-    background-color: COLOR_CANCEL
+    background-color: COLOR_cancel
+
+
+
+
+/* -------------------------- BUTTONS -------------------------- */
 
 FORM_shadow_form =  'inset 0 1px 2px rgba(0,0,0,0.1)'
 FORM_shadow_form_active =  'inset 0 1px 1px rgba(0,0,0,0.1), 3px 0 #f0eeef, 0 3px #f0eeef, -3px 0 #f0eeef, 0 -3px #f0eeef'
@@ -274,14 +281,14 @@ form, .form
     &:not(.checkbox)
       background-color: #c7c7c7
       &:active
-        background-color: THEME_lighten
+        background-color: THEME_light
 
 
     &.checkbox
       background-color: #aaaaaa
       color: rgba(255,255,255,0.6)
       &.active
-        background-color: THEME_lighten
+        background-color: THEME_light
 
     &::-webkit-slider-thumb
       border-radius: FORM-border-radius
@@ -308,36 +315,3 @@ form, .form
           text-shadow: 0 1px 0 rgba(255,255,255,0.2) !important
           font-size: 12px
 
-
-.tag
-  color: #fff
-  border-radius 2px
-  font-weight: 400 !important
-  &.count
-    background: THEME
-  header .count
-    background: THEME-dark !important
-  footer &
-    box-shadow inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5)
-  article .list &
-    box-shadow inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3)
-
-.notification
-  color: #fff
-  & .window
-    &.confirm
-      background: #333
-    &.notify
-      text-shadow: 0 1px 0px rgba(0,0,0,0.1)
-      .box-shadow( inset 0 1px 0 rgba(255,255,255,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), 0px 1px 2px rgba(0,0,0,0.25) )
-      &.error
-        background: NOTIFICATION-error
-      &.alert
-        background: NOTIFICATION-alert
-      &.success
-        background: NOTIFICATION-success
-    &.url
-      & .close
-        background: #000
-        border: solid 2px #fff
-        box-shadow: 0 0 4px black

+ 1 - 1
src/stylesheets/css/Lungo.layout.nav.css

@@ -22,7 +22,7 @@ footer nav > a {
   box-flex: 1;
 }
 header nav a {
-  padding: 0px 12px !important;
+  padding: 0px 10px !important;
   z-index: 1000;
   float: left;
 }

+ 227 - 223
src/stylesheets/css/Lungo.theme.default.css

@@ -6,12 +6,10 @@
  *
  * @author Javier Jimenez Villar <javi@tapquo.com> || @soyjavi
  */
-@import url("http://fonts.googleapis.com/css?family=Titillium+Web:200,400,700");
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700");
-/* COLORS */
+/* -------------------------- THEME -------------------------- */
 body {
-  background: #000;
-  font-family: "Open Sans", "Titillium Web", Helvetica, Arial, sans-serif;
+  background-color: #222;
+  font-family: "Helvetica Neue", "Open Sans", "Titillium Web", Helvetica, Arial, sans-serif;
   font-weight: 400;
   font-size: 13px;
   line-height: 1.3em;
@@ -20,12 +18,12 @@ body {
 .theme,
 li.theme,
 a.theme {
-  background: THEME-light;
+  background-color: THEME-light;
 }
 .theme:active,
 li.theme:active,
 a.theme:active {
-  background: #0093d5;
+  background-color: #0093d5;
 }
 [data-control="pull"] {
   color: #666;
@@ -33,216 +31,283 @@ a.theme:active {
   -moz-text-shadow: 0 1px 0 #fff;
   text-shadow: 0 1px 0 #fff;
 }
+/* -------------------------- LAYOUT COLORS -------------------------- */
 section > header {
   background-color: #0093d5;
   -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #03b1ff, inset 0 -1px 0 #007db5;
   -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #03b1ff, inset 0 -1px 0 #007db5;
   box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #03b1ff, inset 0 -1px 0 #007db5;
-}
-section > header .title {
   color: #fff;
 }
-section > footer {
-  background-color: THEME-dark;
-  -webkit-box-shadow: inset 0 3px 0 #333;
-  -moz-box-shadow: inset 0 3px 0 #333;
-  box-shadow: inset 0 3px 0 #333;
-}
-section > footer > nav a {
-  -webkit-box-shadow: 1px 0 0 #151515;
-  -moz-box-shadow: 1px 0 0 #151515;
-  box-shadow: 1px 0 0 #151515;
-}
-section > footer > nav a.current {
-  color: #fff;
-  background: #111;
-  -webkit-box-shadow: -1px 0 0 #252525, 1px 0 0 #252525, inset 0 3px 0 #0093d5;
-  -moz-box-shadow: -1px 0 0 #252525, 1px 0 0 #252525, inset 0 3px 0 #0093d5;
-  box-shadow: -1px 0 0 #252525, 1px 0 0 #252525, inset 0 3px 0 #0093d5;
+section > footer,
+section nav.groupbar {
+  background-color: #222;
+  -webkit-box-shadow: inset 0 3px 0 #1d1d1d;
+  -moz-box-shadow: inset 0 3px 0 #1d1d1d;
+  box-shadow: inset 0 3px 0 #1d1d1d;
 }
 section > article,
 section > [data-control="pull"] {
-  background: #f4f5f5;
+  background-color: #f4f5f5;
+}
+section > article.splash,
+section > [data-control="pull"].splash {
+  background: #0093d5;
+  color: #fff;
 }
 section.aside {
-  -webkit-box-shadow: -1px 0 0 rgba(0,0,0,0.2);
-  -moz-box-shadow: -1px 0 0 rgba(0,0,0,0.2);
-  box-shadow: -1px 0 0 rgba(0,0,0,0.2);
+  -webkit-box-shadow: -1px 0 2px rgba(0,0,0,0.2);
+  -moz-box-shadow: -1px 0 2px rgba(0,0,0,0.2);
+  box-shadow: -1px 0 2px rgba(0,0,0,0.2);
 }
 section.aside.right {
-  -webkit-box-shadow: 4px 0 8px rgba(0,0,0,0.5);
-  -moz-box-shadow: 4px 0 8px rgba(0,0,0,0.5);
-  box-shadow: 4px 0 8px rgba(0,0,0,0.5);
+  -webkit-box-shadow: 1px 0 2px rgba(0,0,0,0.2);
+  -moz-box-shadow: 1px 0 2px rgba(0,0,0,0.2);
+  box-shadow: 1px 0 2px rgba(0,0,0,0.2);
 }
 aside {
+  background-color: #1d1d1d;
   color: #fff;
-  background: #191919;
 }
-aside header,
-aside footer {
-  background: #111;
-  -webkit-text-shadow: none;
-  -moz-text-shadow: none;
-  text-shadow: none;
+aside > header,
+aside > footer {
+  background-color: #181818;
 }
-aside header {
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2);
-  box-shadow: inset 0 -1px 0 rgba(0,0,0,0.2);
+aside > header {
+  -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #222, inset 0 -1px 0 #141414;
+  -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #222, inset 0 -1px 0 #141414;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.25), inset 0 1px 0 #222, inset 0 -1px 0 #141414;
 }
-aside article {
-  background: none;
-}
-aside nav a.current .icon {
+/* -------------------------- NAVIGATION -------------------------- */
+section > header > nav a {
   color: #fff;
 }
-aside nav a:not(.current) .icon {
-  color: #888;
-}
-aside .list li {
-  background: none;
-  border-bottom-color: #222 !important;
-}
-aside .list li.current {
-  background: #0093d5;
-  border-bottom-color: #0093d5;
-}
-aside .list li.current strong,
-aside .list li.current small,
-aside .list li.current .icon {
-  color: #fff;
-}
-aside .list li strong {
-  color: #999;
-}
-aside .list li small,
-aside .list li .icon {
-  color: #666;
-}
-header nav a {
-  color: #fff;
-}
-header nav.box:not(.right) a {
+section > header > nav.box:not(.right) a {
   -webkit-box-shadow: 1px 0 0 #03b1ff, inset -1px 0 0 #007db5;
   -moz-box-shadow: 1px 0 0 #03b1ff, inset -1px 0 0 #007db5;
   box-shadow: 1px 0 0 #03b1ff, inset -1px 0 0 #007db5;
 }
-header nav.box.right a {
+section > header > nav.box.right a {
   -webkit-box-shadow: -1px 0 0 #03b1ff, inset 1px 0 0 #007db5;
   -moz-box-shadow: -1px 0 0 #03b1ff, inset 1px 0 0 #007db5;
   box-shadow: -1px 0 0 #03b1ff, inset 1px 0 0 #007db5;
 }
-header nav.box a:active {
-  background: rgba(0,0,0,0.1);
-}
-section > nav.groupbar {
-  background-color: #222;
+section > header > nav.box a:active {
+  background: #007db5;
 }
 section > nav.groupbar > a.current {
   -webkit-box-shadow: inset 0 -3px 0 #0093d5;
   -moz-box-shadow: inset 0 -3px 0 #0093d5;
   box-shadow: inset 0 -3px 0 #0093d5;
 }
-footer > nav > a,
+section > footer > nav > a,
 nav.groupbar > a {
   color: #888;
 }
-footer > nav > a.current,
+section > footer > nav > a.current,
 nav.groupbar > a.current {
   color: #fff;
 }
-.list li {
-  background: #fff;
-  border-bottom: inset 1px #e5e5e5;
-}
-.list li.secondary {
-  -webkit-box-shadow: inset 4px 0px 0px #ccc;
-  -moz-box-shadow: inset 4px 0px 0px #ccc;
-  box-shadow: inset 4px 0px 0px #ccc;
-}
-.list li.accept {
-  -webkit-box-shadow: inset 4px 0px 0px #009600;
-  -moz-box-shadow: inset 4px 0px 0px #009600;
-  box-shadow: inset 4px 0px 0px #009600;
-}
-.list li.cancel {
-  -webkit-box-shadow: inset 4px 0px 0px #e33100;
-  -moz-box-shadow: inset 4px 0px 0px #e33100;
-  box-shadow: inset 4px 0px 0px #e33100;
-}
-.list li,
-.list li a {
-  color: #111;
-}
-.list li.dark,
-.list li a.dark {
-  background: #444;
-}
-.list li.dark,
-.list li a.dark,
-.list li.dark a,
-.list li a.dark a {
-  color: #fff;
+section > footer > nav > a {
+  -webkit-box-shadow: 1px 0 0 #1d1d1d;
+  -moz-box-shadow: 1px 0 0 #1d1d1d;
+  box-shadow: 1px 0 0 #1d1d1d;
 }
-.list li.selectable:active,
-.list li a.selectable:active,
-.list li.theme,
-.list li a.theme {
-  background: #03b1ff;
+section > footer > nav > a.current {
+  color: #fff;
+  background-color: #1d1d1d;
+  -webkit-box-shadow: inset 0 3px 0 #0093d5;
+  -moz-box-shadow: inset 0 3px 0 #0093d5;
+  box-shadow: inset 0 3px 0 #0093d5;
 }
-.list li.selectable:active,
-.list li a.selectable:active,
-.list li.theme,
-.list li a.theme,
-.list li.selectable:active a,
-.list li a.selectable:active a,
-.list li.theme a,
-.list li a.theme a {
+aside nav a.current .icon {
   color: #fff;
 }
-.list li.light,
-.list li a.light {
-  background: #e5e5e5;
-  -webkit-text-shadow: 0 1px 0 #eee;
-  -moz-text-shadow: 0 1px 0 #eee;
-  text-shadow: 0 1px 0 #eee;
-}
-.list li.light,
-.list li a.light,
-.list li.light a,
-.list li a.light a {
+aside nav a:not(.current) .icon {
   color: #888;
 }
-.list li.anchor,
-.list li a.anchor {
+aside nav.box:not(.right) a {
+  -webkit-box-shadow: 1px 0 0 #222, inset -1px 0 0 #141414;
+  -moz-box-shadow: 1px 0 0 #222, inset -1px 0 0 #141414;
+  box-shadow: 1px 0 0 #222, inset -1px 0 0 #141414;
+}
+aside nav.box.right a {
+  -webkit-box-shadow: -1px 0 0 #222, inset 1px 0 0 #141414;
+  -moz-box-shadow: -1px 0 0 #222, inset 1px 0 0 #141414;
+  box-shadow: -1px 0 0 #222, inset 1px 0 0 #141414;
+}
+aside nav.box a:active {
+  background: #141414;
+}
+/* -------------------------- LISTS -------------------------- */
+section .list li {
+  background: #fff;
+}
+section .list li:not(.anchor) {
+  border-bottom: inset 1px #ebebeb;
+}
+section .list li.secondary {
+  -webkit-box-shadow: inset 4px 0px 0px #bfbfbf;
+  -moz-box-shadow: inset 4px 0px 0px #bfbfbf;
+  box-shadow: inset 4px 0px 0px #bfbfbf;
+}
+section .list li.accept {
+  -webkit-box-shadow: inset 4px 0px 0px #3fb58e;
+  -moz-box-shadow: inset 4px 0px 0px #3fb58e;
+  box-shadow: inset 4px 0px 0px #3fb58e;
+}
+section .list li.cancel {
+  -webkit-box-shadow: inset 4px 0px 0px #ee6557;
+  -moz-box-shadow: inset 4px 0px 0px #ee6557;
+  box-shadow: inset 4px 0px 0px #ee6557;
+}
+section .list li,
+section .list li a {
+  color: #333;
+}
+section .list li.anchor,
+section .list li a.anchor {
   background: #222;
-  border-bottom: none;
 }
-.list li.anchor,
-.list li a.anchor,
-.list li.anchor a,
-.list li a.anchor a {
-  color: #fff !important;
+section .list li.dark,
+section .list li a.dark {
+  background: #595959;
+}
+section .list li.selectable:active,
+section .list li a.selectable:active,
+section .list li.theme,
+section .list li a.theme,
+section .list li.active,
+section .list li a.active {
+  background: #03b1ff;
+}
+section .list li.light,
+section .list li a.light {
+  background: #ebebeb;
+  color: #7a7a7a;
+}
+section .list li.dark,
+section .list li a.dark,
+section .list li.selectable:active,
+section .list li a.selectable:active,
+section .list li.theme,
+section .list li a.theme,
+section .list li.anchor,
+section .list li a.anchor,
+section .list li.dark small,
+section .list li a.dark small,
+section .list li.selectable:active small,
+section .list li a.selectable:active small,
+section .list li.theme small,
+section .list li a.theme small,
+section .list li.anchor small,
+section .list li a.anchor small,
+section .list li.dark .right:not(.tag),
+section .list li a.dark .right:not(.tag),
+section .list li.selectable:active .right:not(.tag),
+section .list li a.selectable:active .right:not(.tag),
+section .list li.theme .right:not(.tag),
+section .list li a.theme .right:not(.tag),
+section .list li.anchor .right:not(.tag),
+section .list li a.anchor .right:not(.tag) {
+  color: #fff;
 }
-.list li small,
-.list li a small,
-.list li .right:not(.tag),
-.list li a .right:not(.tag) {
-  color: #555;
+section .list li small,
+section .list li a small,
+section .list li .right:not(.tag),
+section .list li a .right:not(.tag) {
+  color: #7a7a7a;
 }
 .list:not(.indented) li.dark,
 .list:not(.indented) li.theme,
 .list:not(.indented) li.light {
   border-bottom-color: rgba(0,0,0,0.1);
 }
-.splash {
-  background: THEME-dark;
+aside .list li {
+  background: none;
+  border-bottom-color: #222;
+}
+aside .list li.current {
+  background: #0093d5;
+  border-bottom-color: transparent;
+}
+aside .list li.current strong,
+aside .list li.current small,
+aside .list li.current .icon {
   color: #fff;
-  -webkit-text-shadow: 0 1px 0px rgba(0,0,0,0.2);
-  -moz-text-shadow: 0 1px 0px rgba(0,0,0,0.2);
-  text-shadow: 0 1px 0px rgba(0,0,0,0.2);
 }
-/* ____________________ BUTTONS ____________________ */
+aside .list li strong {
+  color: #999;
+}
+aside .list li small,
+aside .list li .icon {
+  color: #666;
+}
+/* -------------------------- TAG -------------------------- */
+.tag {
+  color: #fff;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  font-weight: 400 !important;
+}
+.tag.count {
+  background: #0093d5;
+}
+.tag header .count {
+  background: THEME-dark !important;
+}
+footer .tag {
+  -webkit-box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
+  -moz-box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
+  box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
+}
+article .list .tag {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
+  -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
+  box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
+}
+/* -------------------------- NOTIFICATION -------------------------- */
+.notification {
+  color: #fff;
+}
+.notification .window.confirm {
+  background: #333;
+}
+.notification .window.notify {
+  -webkit-text-shadow: 0 1px 0px rgba(0,0,0,0.1);
+  -moz-text-shadow: 0 1px 0px rgba(0,0,0,0.1);
+  text-shadow: 0 1px 0px rgba(0,0,0,0.1);
+}
+.notification .window.notify .box-shadow( inset 0 1px 0 rgba(255,
+.notification .window.notify 255,
+.notification .window.notify 255,
+.notification .window.notify 0.2),
+.notification .window.notify inset 0-1px0rgba(0,
+.notification .window.notify 0,
+.notification .window.notify 0,
+.notification .window.notify 0.2),
+.notification .window.notify 0px1px2pxrgba(0,
+.notification .window.notify 0,
+.notification .window.notify 0,
+.notification .window.notify 0.25) ),
+.notification .window.notify.error {
+  background: #ee6557;
+}
+.notification .window.notify.alert {
+  background: #bfbfbf;
+}
+.notification .window.notify.success {
+  background: #3fb58e;
+}
+.notification .window.url .close {
+  background: #000;
+  border: solid 2px #fff;
+  -webkit-box-shadow: 0 0 4px #000;
+  -moz-box-shadow: 0 0 4px #000;
+  box-shadow: 0 0 4px #000;
+}
+/* -------------------------- BUTTONS -------------------------- */
 a.button,
 button {
   -webkit-border-radius: FORM-border-radius;
@@ -280,18 +345,19 @@ button,
 button.secondary,
 .button.secondary,
 .tag.secondary {
-  background-color: #ccc;
+  background-color: #bfbfbf;
 }
 button.accept,
 .button.accept,
 .tag.accept {
-  background-color: #009600;
+  background-color: #3fb58e;
 }
 button.cancel,
 .button.cancel,
 .tag.cancel {
-  background-color: #e33100;
+  background-color: #ee6557;
 }
+/* -------------------------- BUTTONS -------------------------- */
 form label,
 .form label {
   color: #999;
@@ -506,65 +572,3 @@ form .progress .bar .value .label,
   text-shadow: 0 1px 0 rgba(255,255,255,0.2) !important;
   font-size: 12px;
 }
-.tag {
-  color: #fff;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  font-weight: 400 !important;
-}
-.tag.count {
-  background: #0093d5;
-}
-.tag header .count {
-  background: THEME-dark !important;
-}
-footer .tag {
-  -webkit-box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
-  -moz-box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
-  box-shadow: inset 0 1px 1px rgba(255,255,255,0.3), 0 1px 2px rgba(0,0,0,0.5);
-}
-article .list .tag {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
-  -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
-  box-shadow: inset 1px 0 0 rgba(0,0,0,0.3), inset 0 1px 0 rgba(0,0,0,0.3), inset -1px 0 0 rgba(0,0,0,0.3), inset 0 -1px 0 rgba(0,0,0,0.3);
-}
-.notification {
-  color: #fff;
-}
-.notification .window.confirm {
-  background: #333;
-}
-.notification .window.notify {
-  -webkit-text-shadow: 0 1px 0px rgba(0,0,0,0.1);
-  -moz-text-shadow: 0 1px 0px rgba(0,0,0,0.1);
-  text-shadow: 0 1px 0px rgba(0,0,0,0.1);
-}
-.notification .window.notify .box-shadow( inset 0 1px 0 rgba(255,
-.notification .window.notify 255,
-.notification .window.notify 255,
-.notification .window.notify 0.2),
-.notification .window.notify inset 0-1px0rgba(0,
-.notification .window.notify 0,
-.notification .window.notify 0,
-.notification .window.notify 0.2),
-.notification .window.notify 0px1px2pxrgba(0,
-.notification .window.notify 0,
-.notification .window.notify 0,
-.notification .window.notify 0.25) ),
-.notification .window.notify.error {
-  background: NOTIFICATION-error;
-}
-.notification .window.notify.alert {
-  background: NOTIFICATION-alert;
-}
-.notification .window.notify.success {
-  background: NOTIFICATION-success;
-}
-.notification .window.url .close {
-  background: #000;
-  border: solid 2px #fff;
-  -webkit-box-shadow: 0 0 4px #000;
-  -moz-box-shadow: 0 0 4px #000;
-  box-shadow: 0 0 4px #000;
-}