Make sidebar exhibit nav default value, fix link colors for login for…

…m in winter styles and mounted styles for night theme. (#26)
omeka · Jan 21, 2016 · 6098de2 · 6098de2
1 parent cf8ef07
commit 6098de2
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 11 deletions.
diff --git a/config.ini b/config.ini
@@ -68,7 +68,7 @@ exhibits_nav.options.multiOptions.full = "Full-width"
 exhibits_nav.options.multiOptions.side = "Sidebar"
 exhibits_nav.options.label = "Select exhibit page navigation style."
 exhibits_nav.options.description = "Choose exhibit page navigation style: full-width is a bar that stretches across the page, and sidebar takes up a smaller fraction of the page width."
-exhibits_nav.options.value = "full"
+exhibits_nav.options.value = "side"
 
 [groups]
 

diff --git a/css/sass/_screen.scss b/css/sass/_screen.scss
@@ -598,7 +598,7 @@ footer {
         width: 100%;
     }
 
-    & > div, section, #login-form {
+    & > div, section {
         background-color: #fff;
         border-style: solid;
         border-width: 10px 0 0 0;
@@ -737,6 +737,21 @@ footer {
     }
 }
 
+.login #content form {
+    background-color: #fff;
+    border-style: solid;
+    border-width: 10px 0 0 0;
+    overflow: visible;
+    padding: rhythm(.5) 16px;
+    @include box-shadow(rgba(0,0,0,.15) 0 0 10px);
+    @include boxsizing(border-box);
+    @include trailer(.75);
+
+    & > *:only-child { margin-top: 0; }
+
+    @include pie-clearfix();
+}
+
 .asc a:after,
 .desc a:after {
     font-family: "FontAwesome";
@@ -1414,7 +1429,7 @@ footer {
     #secondary-nav a.current,
     .secondary-nav .current a,
     .secondary-nav a.current,
-    .exhibit-section-nav .current a {
+    .exhibit-section-nav .current a{
         background-color: $winter-pale-blue;
     }
 
@@ -1457,7 +1472,11 @@ footer {
             background-color: $winter-bright-blue;
         }
 
-        .items-nav, .secondary-nav, #secondary-nav, #outputs, #exhibit-child-pages {
+        .items-nav, .secondary-nav,
+        #secondary-nav,
+        #outputs,
+        #exhibit-child-pages,
+        #login-links a  {
             color: #fff;
 
             a:link, a:visited { color: $winter-blue-on-pale-blue; }
@@ -1976,7 +1995,7 @@ footer {
     #content,
     #secondary-nav .current a,
     #secondary-nav a.current,
-    .exhibit-section-nav .current a {
+    .exhibit-section-nav .current a{
         background-color: $night-content;
     }
 
@@ -2043,6 +2062,11 @@ footer {
 
     }
 
+    .login #content form {
+        border-color: $night-highlight;
+        background-color: $night-darker;
+    }
+
     #search-results th {
         background-color: $night-highlight;
         color: $night-light;

diff --git a/css/style.css b/css/style.css
@@ -620,7 +620,7 @@
     margin: 0 0 0.75em -16px;
     width: 100%;
   }
-  #content > div, #content section, #content #login-form {
+  #content > div, #content section {
     background-color: #fff;
     border-style: solid;
     border-width: 10px 0 0 0;
@@ -636,10 +636,10 @@
     margin-bottom: 1.125em;
     *zoom: 1;
   }
-  #content > div > *:only-child, #content section > *:only-child, #content #login-form > *:only-child {
+  #content > div > *:only-child, #content section > *:only-child {
     margin-top: 0;
   }
-  #content > div:after, #content section:after, #content #login-form:after {
+  #content > div:after, #content section:after {
     content: "";
     display: table;
     clear: both;
@@ -766,6 +766,31 @@
     padding-left: 0;
   }
 
+  .login #content form {
+    background-color: #fff;
+    border-style: solid;
+    border-width: 10px 0 0 0;
+    overflow: visible;
+    padding: 0.75em 16px;
+    -moz-box-shadow: rgba(0, 0, 0, 0.15) 0 0 10px;
+    -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 0 10px;
+    box-shadow: rgba(0, 0, 0, 0.15) 0 0 10px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    *behavior: url("../javascripts/boxsizing.htc");
+    margin-bottom: 1.125em;
+    *zoom: 1;
+  }
+  .login #content form > *:only-child {
+    margin-top: 0;
+  }
+  .login #content form:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+
   .asc a:after,
   .desc a:after {
     font-family: "FontAwesome";
@@ -1494,13 +1519,33 @@
   .winter #content nav .pagination_list {
     background-color: #228494;
   }
-  .winter #content .items-nav, .winter #content .secondary-nav, .winter #content #secondary-nav, .winter #content #outputs, .winter #content #exhibit-child-pages {
+  .winter #content .items-nav, .winter #content .secondary-nav,
+  .winter #content #secondary-nav,
+  .winter #content #outputs,
+  .winter #content #exhibit-child-pages,
+  .winter #content #login-links a {
     color: #fff;
   }
-  .winter #content .items-nav a:link, .winter #content .items-nav a:visited, .winter #content .secondary-nav a:link, .winter #content .secondary-nav a:visited, .winter #content #secondary-nav a:link, .winter #content #secondary-nav a:visited, .winter #content #outputs a:link, .winter #content #outputs a:visited, .winter #content #exhibit-child-pages a:link, .winter #content #exhibit-child-pages a:visited {
+  .winter #content .items-nav a:link, .winter #content .items-nav a:visited, .winter #content .secondary-nav a:link, .winter #content .secondary-nav a:visited,
+  .winter #content #secondary-nav a:link,
+  .winter #content #secondary-nav a:visited,
+  .winter #content #outputs a:link,
+  .winter #content #outputs a:visited,
+  .winter #content #exhibit-child-pages a:link,
+  .winter #content #exhibit-child-pages a:visited,
+  .winter #content #login-links a a:link,
+  .winter #content #login-links a a:visited {
     color: #def9ff;
   }
-  .winter #content .items-nav a:hover, .winter #content .items-nav a:active, .winter #content .secondary-nav a:hover, .winter #content .secondary-nav a:active, .winter #content #secondary-nav a:hover, .winter #content #secondary-nav a:active, .winter #content #outputs a:hover, .winter #content #outputs a:active, .winter #content #exhibit-child-pages a:hover, .winter #content #exhibit-child-pages a:active {
+  .winter #content .items-nav a:hover, .winter #content .items-nav a:active, .winter #content .secondary-nav a:hover, .winter #content .secondary-nav a:active,
+  .winter #content #secondary-nav a:hover,
+  .winter #content #secondary-nav a:active,
+  .winter #content #outputs a:hover,
+  .winter #content #outputs a:active,
+  .winter #content #exhibit-child-pages a:hover,
+  .winter #content #exhibit-child-pages a:active,
+  .winter #content #login-links a a:hover,
+  .winter #content #login-links a a:active {
     color: #fff;
   }
   .winter #content .item-img {
@@ -2085,6 +2130,10 @@
     -webkit-box-shadow: transparent 0 0 0;
     box-shadow: transparent 0 0 0;
   }
+  .night .login #content form {
+    border-color: #666;
+    background-color: #252525;
+  }
   .night #search-results th {
     background-color: #666;
     color: #BDBDBD;