trusty-cms 4.0.1 → 4.1.3

data/app/assets/stylesheets/admin/partials/_header.scss

@@ -1,139 +1,30 @@
-#header {
-  font-size: 90%;
-  background: $header;
-  background-image: linear-gradient(to bottom, #000000, #000000, #000000);
+header {
+  background-color: $header;
+  grid-area: header;
+  min-height: 50px;
   position: relative;
-  &:after {
-    content: "\0020";
-    display: block;
-    clear: both;
-    overflow: hidden;
-    height: 2px;
-    width: 100%;
-    position: absolute;
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0));
-  }
 }
 
 #site_links {
   color: mix($header, white, 15%);
-  font-size: 80%;
   float: right;
-  padding: 12px 10px 0 5px;
+  font-size: 80%;
   height: 16px;
+  padding: 12px 10px 0 5px;
+
   a {
     color: white;
   }
+
   a:hover, strong a {
     text-decoration: none;
   }
 }
 
 #view_site {
-  font-size: 90%;
   background: rgba(black, 0.45);
-  border-radius: 5px;
   display: inline;
+  font-size: 90%;
   padding: 3px 10px 4px;
   text-decoration: none;
 }
-
-ul#navigation {
-  float: left;
-  margin-top: 6px;
-  li {
-    float: left;
-    height: 30px;
-    margin: 4px 0 0 8px;
-    white-space: nowrap;
-    a {
-      background: $primary-tab;
-      color: mix($header, white, 15%);
-      display: block;
-      height: 30px;
-      line-height: 30px;
-      padding: 0 20px;
-      position: relative;
-      text-decoration: none;
-      border-top-left-radius: 6px;
-      border-top-right-radius: 6px;
-    }
-    &:hover a {
-      background: opacify($primary-tab, 0.2);
-      color: white;
-    }
-    &.current a {
-      background: white;
-      color: #333333;
-      font-weight: bold;
-    }
-  }
-}
-
-#toolbar {
-  background: white;
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2, #cccccc);
-  font-size: 95%;
-  clear: both;
-  margin: 0;
-  width: 100%;
-  height: 38px;
-  &:after {
-    clear: both;
-    content: "";
-    display: block;
-  }
-  .right {
-    float: right;
-  }
-  form.search {
-    padding: 8px 8px 0;
-    input[type=search] {
-      font-size: 12px;
-      border-radius: 100px;
-      border: 1px solid #cccccc;
-      border-top-color: #999999;
-      border-left-color: #b0b0b0;
-      border-right-color: #bbbbbb;
-      background: white image_url("admin/search.png") 4px center no-repeat;
-      box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2);
-      width: 180px;
-      padding: 2px 8px 2px 20px;
-    }
-  }
-}
-
-ul#secondary_navigation {
-  float: left;
-  margin-right: 8px;
-  li {
-    float: left;
-    display: block;
-    border-right: 1px solid #d3d3d3;
-    a {
-      color: #555555;
-      display: block;
-      font-weight: normal;
-      float: left;
-      line-height: 38px;
-      margin: 0;
-      padding: 0 26px;
-      height: 38px;
-      text-decoration: none;
-      &:hover {
-        background-image: linear-gradient(to bottom, #e4f9ff, #d2ebfd 30%, #b1d1f1 50%, #9bc5ed 50%, #caecff);
-        color: #444444;
-      }
-      &.current {
-        background: #dddddd;
-        background-image: linear-gradient(to bottom, #ffffff, #e6e6e6 35%, #d9d9d9 50%, #cccccc 50%, #d9d9d9);
-        color: #333333;
-        font-weight: bold;
-        &:hover {
-          background-image: linear-gradient(to bottom, #e0f9fe, #c4e2f8 30%, #98c3e7 50%, #79aedb 50%, #b1ddef);
-          color: #222222;
-        }
-      }
-    }
-  }
-}

data/app/assets/stylesheets/admin/partials/_layout.scss

@@ -1,10 +1,19 @@
+.trusty-container {
+  display: grid;
+  grid-template-areas: "header header header" "nav toolbar content";
+  grid-template-columns: auto auto 1fr;
+  grid-template-rows: auto 1fr;
+  height: 100vh;
+}
+
 body.reversed {
-  background-color: #737272;
+  background-color: $light-gray;
 }
 
 body.single_form {
-  #content {
+  .content {
     text-align: center;
+
     #single_form {
       margin: 6em auto 0;
       text-align: left;
@@ -19,3 +28,18 @@ body.reversed.login_form {
 body.reversed.password_form {
   background-color: #fff;
 }
+
+.set {
+  div {
+    display: inline-block;
+  }
+}
+
+.page-actions {
+  margin: 0.5em 0;
+}
+
+.updated_line {
+  margin: 0.5em 0;
+  @include subtle-text-reversed;
+}

data/app/assets/stylesheets/admin/partials/_login_form.scss

@@ -0,0 +1,28 @@
+.login-form-content {
+  display: flex;
+  flex-flow: wrap;
+  justify-content: center;
+  margin-top: 5em;
+
+  .visual {
+    img {
+      float: right;
+      height: 300px;
+    }
+  }
+
+  .login {
+    form {
+      padding: 1em;
+
+      .field #user_email, .field #user_password, .field #user_password_confirmation {
+        max-width: 200px;
+      }
+    }
+
+    .error {
+      display: block;
+      margin: 1em;
+    }
+  }
+}

data/app/assets/stylesheets/admin/partials/_messages.scss

@@ -1,13 +1,18 @@
-#notice, #error {
-  padding: 1px 1em;
+.notice, .error {
+  padding: 1em;
 }
 
-#notice {
+.notice {
   background-color: #b2e5b2;
   color: #006600;
 }
 
-#error {
+.error {
   background-color: #f3c2c2;
-  color: #770000;
+  color: $alt-link-color;
+}
+
+.warning {
+  color: $alt-link-color;
+  line-height: 1em;
 }

data/app/assets/stylesheets/admin/partials/_popup.scss

@@ -1,104 +1,117 @@
 div.popup {
-  color: #333333;
-  background-color: white;
+  background-color: $white;
   border: 1px solid #777777;
-  padding: 10px 20px;
+  color: #333333;
   display: none;
+  padding: 10px 20px;
+
   strong {
     font-weight: bold;
   }
+
   em {
     font-style: italic;
   }
+
   .busy {
     float: right;
     margin-top: 9px;
   }
+
   .popup_title {
-    background: #c5dff5;
-    background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
-    border-bottom: 1px solid #a7cdf0;
+    background: $darker-blue;
+    border-bottom: 1px solid $darker-blue;
+    color: $white;
     font-weight: bold;
-    font-size: 100%;
     margin: -10px -20px 20px -20px;
-    padding: 6px 10px;
+    padding: 0.75em;
   }
+
   p.intro {
     font-size: 90%;
   }
+
   label {
+    color: $dark-gray;
     display: block;
     font-size: 85%;
+
     &.inline {
       display: inline;
     }
+
     span.hint {
-      font-size: 90%;
       color: #666666;
+      font-size: 90%;
     }
   }
+
   input.button {
     font-size: 120%;
   }
+
   .viewport {
-    background: white;
-    border: 1px solid #dddddd;
-    border-top: 1px solid #cccccc;
-    border-left: 1px solid #cccccc;
-    box-shadow: 1px 1px 0 white;
+    background: $white;
+    border: 1px solid $light-gray;
     margin: 1em 0;
     overflow: auto;
+
     table.index {
       margin: -1px 0 0;
     }
   }
+
   .buttons {
-    border-top: 1px solid #e5e5e5;
     text-align: right;
+
     input.button {
       font-size: 120%;
     }
+
     button {
       &.default {
         border: 1px solid #154ca6;
-        box-shadow: inset 0 2px 1px #c7e0f6;
         color: white;
-        background-image: linear-gradient(to bottom, #67b4e1, #78b9e1);
       }
+
       &:active {
         border: 1px solid #888888;
-        box-shadow: none;
-        background-image: linear-gradient(to bottom, #cccccc 0%, #dddddd 15%, #eeeeee 100%);
       }
+
       &.default:active {
         border: 1px solid #002c86;
-        background-image: linear-gradient(to bottom, #4794c1, #78b9e1);
       }
+
       &:focus {
         border-width: 2px;
       }
     }
+
     a.cancel {
       color: $alt-link-color;
     }
   }
+
   .tag_description, .snippet_description {
     border-bottom: 1px dotted silver;
     font-size: 95%;
     padding: 6px 0;
+
     h4 {
       color: green;
       font-size: 120%;
-      margin-top: 0;
       margin-bottom: 8px;
+      margin-top: 0;
     }
+
     code {
       background-color: whitesmoke;
       color: #666666;
       font-family: Monaco, "Courier New", Courier, monospace;
-      padding-top: 1px;
       padding-bottom: 1px;
+      padding-top: 1px;
     }
+
     pre {
       background-color: whitesmoke;
       border: 1px solid #dddddd;
@@ -108,24 +121,27 @@ div.popup {
       padding: 10px;
     }
   }
+
   .reference {
-    font-size: 90%;
     border: 1px solid silver;
+    font-size: 90%;
+    height: 300px;
+    line-height: 140%;
     overflow: auto;
-    overflow-y: auto;
     overflow-x: hidden;
-    line-height: 140%;
+    overflow-y: auto;
     padding: 12px;
     padding-top: 1px;
-    height: 300px;
     width: 40em;
+
     code {
       background-color: whitesmoke;
       color: #666666;
       font-family: Monaco, "Courier New", Courier, monospace;
-      padding-top: 1px;
       padding-bottom: 1px;
+      padding-top: 1px;
     }
+
     pre {
       background-color: whitesmoke;
       border: 1px solid #dddddd;
@@ -134,8 +150,10 @@ div.popup {
       overflow: auto;
       padding: 10px;
     }
+
     table {
       width: 100%;
+
       th {
         color: green;
         font-size: 120%;
@@ -143,30 +161,34 @@ div.popup {
         padding-left: 0;
         padding-right: 0;
       }
+
       td {
         border-bottom: 1px dotted silver;
-        padding-top: 8px;
         padding-bottom: 8px;
+        padding-top: 8px;
         text-align: left;
       }
+
       h1 {
         color: black;
         margin: 0;
         margin-bottom: 0.5em;
       }
+
       acronym {
         border-bottom: 1px dotted silver;
       }
+
       blockquote {
         border-left: 4px solid silver;
+        margin-bottom: 1em;
+        margin-top: 1em;
         padding-left: 1em;
         padding-right: 1em;
-        margin: 0;
-        margin-top: 1em;
-        margin-bottom: 1em;
       }
     }
   }
+
   .close_link {
     font-size: 85%;
     text-align: center;
@@ -177,12 +199,13 @@ div.popup {
   color: green;
   cursor: pointer;
   font-size: 120%;
-  margin-top: 0;
   margin-bottom: 8px;
+  margin-top: 0;
 }
 
 .tag_options {
   margin-left: 1em;
+
   li {
     margin-bottom: 8px;
   }
@@ -190,14 +213,18 @@ div.popup {
 
 .tag_option_value_list {
   margin-left: 1em;
+
   li {
     display: inline;
+
     &:last-child {
       border: none;
     }
+
     code {
       padding-left: 0.3em;
       padding-right: 0.3em;
+
       &:hover {
         background: #666666;
         color: white;
@@ -209,10 +236,11 @@ div.popup {
 div.popup .reference table {
   th {
     border-bottom: 1px dotted silver;
-    padding-top: 8px;
     padding-bottom: 8px;
+    padding-top: 8px;
     text-align: left;
   }
+
   h2, h3, h4 {
     color: black;
     margin: 0;
@@ -220,23 +248,6 @@ div.popup .reference table {
   }
 }
 
-div.popup.textured {
-  background: #eeeeee;
-  .head {
-    background: white;
-    padding: 10px 20px;
-    margin: -20px -20px 20px;
-    border-bottom: 1px solid #cccccc;
-    box-shadow: 0 1px 0 white;
-  }
-  .buttons {
-    border-top: 1px solid white;
-    margin: 20px -20px -10px;
-    padding: 20px;
-    box-shadow: 0 -1px 0 #ccc;
-  }
-}
-
 div#popup_window {
   display: none;
   position: absolute;