trusty-cms 4.0.2 → 4.1.0

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

@@ -0,0 +1,37 @@
+#preferences, #config {
+  padding-bottom: 1em;
+
+  h3, h4 {
+    border-bottom: 1px solid $gray;
+    padding-bottom: 0.25em;
+  }
+}
+
+.ruled {
+  border-bottom: 1px solid $light-gray;
+  margin-bottom: 0.5em;
+  padding: 0.5em;
+
+  span {
+    font-weight: bold;
+  }
+
+  label {
+    color: $dark-gray;
+    display: inline-block;
+    font-size: 1em;
+    margin-right: 0.5em;
+  }
+}
+
+#display_password {
+  .button {
+    display: block;
+    max-width: fit-content;
+  }
+}
+
+.checkbox {
+  display: inline-block;
+  margin-right: 0.5em;
+}

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

@@ -0,0 +1,55 @@
+nav {
+  background-color: $white;
+  border-right: 0.5px solid $dark-gray;
+  grid-area: nav;
+
+  ul.navigation {
+    border-right: 0.5px solid $dark-gray;
+
+    a {
+      color: mix($light-gray, white, 15%);
+      text-decoration: none;
+
+      li {
+        background-color: $dark-blue;
+        border-top: 1px solid $light-gray;
+        padding: 1em 7em 1em 1em;
+
+        &:hover {
+          background: darken($dark-blue, 15%);
+          cursor: pointer;
+        }
+
+        &.current {
+          background: darken($dark-blue, 15%);
+          color: $white;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
+
+.toolbar {
+  background-color: $white;
+  border-right: 0.5px solid $dark-gray;
+  grid-area: toolbar;
+
+  ul.secondary_navigation {
+    border-right: 0.5px solid $dark-gray;
+
+    a {
+      text-decoration: none;
+
+      li {
+        border-bottom: 0.5px solid $dark-gray;
+        padding: 1em 5em 1em 1em;
+      }
+
+      &.current {
+        font-style: italic;
+        font-weight: bold;
+      }
+    }
+  }
+}

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

@@ -1,64 +1,58 @@
 #tab_control {
-  color: #333333;
-  margin-bottom: 1em;
   .tabs {
     float: left;
     width: 100%;
-    margin-right: -4px;
+
     .tab {
-      background-color: #e4e4e4;
-      color: black;
+      background-color: darken($light-gray, 5%);
       display: inline-block;
-      font-size: 90%;
-      text-align: left;
+      font-size: 0.8em;
       margin-right: 5px;
-      padding: 8px 15px 5px;
+      padding: 0.85em 0.5em;
       text-decoration: none;
-      text-transform: titlecase;
-      border-top-left-radius: 6px;
-      border-top-right-radius: 6px;
+
       &.here {
-        background-color: white;
-        color: #737272;
+        background-color: $white;
+        color: $gray;
         font-weight: bold;
       }
+
       span:hover {
-        color: #737272;
+        color: $gray;
       }
+
       .close {
-        margin-top: -4px;
-        margin-left: 5px;
-        margin-right: -5px;
+        padding-left: .5em;
       }
     }
   }
+
   .pages {
-    background: white;
-    width: 100%;
+    background: $white;
     clear: both;
+    margin-right: 1em;
+
     .page {
       background: white;
-      background-image: linear-gradient(to bottom, #ffffff, #f5f1e2 15%, #f5f1e2);
-      box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
       padding: 12px 20px 20px;
+
       p {
         margin-top: 0;
       }
+
       label {
+        color: #000;
         display: inline;
-        color: #333333;
-        font-weight: normal;
         font-size: 80%;
+        font-weight: normal;
         text-shadow: none;
       }
     }
+
     .reference_links {
-      font-size: 85%;
-      margin-left: 1em;
       float: right;
-      a {
-        color: #0066cc;
-      }
+      font-size: 85%;
+      margin-bottom: 0;
     }
   }
 }
@@ -67,19 +61,13 @@
   #tab_toolbar {
     float: right;
     overflow: hidden;
-    margin-top: 0.2em;
-    padding: 3px;
+    padding: 0 1em;
   }
 }
 
 .reference_links {
   font-size: 85%;
-  span {
-    padding: 0 0 0 4px;
-    a {
-      color: #4444ee;
-    }
-  }
+  margin-bottom: 1em;
 }
 
 #tag_reference_link {

data/app/assets/stylesheets/admin/partials/{_index.scss → _table.scss}

@@ -1,113 +1,106 @@
 @mixin status-badge($background, $color: white, $width: 5em) {
-  color: $color;
   background: $background;
+  color: $color;
   display: block;
   padding: 0 6px;
-  width: $width;
   text-align: center;
-  border-radius: 100px;
+  width: $width;
 }
 
-table.index {
-  font-size: 90%;
-  margin-bottom: 2em;
-  width: 100%;
-  border-bottom: 1px solid white;
+
+table {
   th {
-    text-align: left;
-    background-color: #9e9e9e;
-    color: white;
-    font-size: 90%;
-    font-weight: normal;
-    padding: 2px 9px;
+    background-color: $light-gray;
+    color: $dark-gray;
+    padding: 0.75em;
+    white-space: nowrap;
+
     &.actions {
-      padding-left: 15px;
-      min-width: 18em;
+      padding: 0 17em 0 1em;
     }
+
     &.name {
       width: 100%;
     }
+
     &.status {
       min-width: 8em;
     }
   }
+
   td {
-    text-align: left;
-    padding: 4px 9px;
     border-top: 1px solid #f0f0f0;
+    font-size: 0.85em;
+    padding: 1em 0.25em;
+
     a.action,
     span.action.disabled {
-      padding: 6px;
       margin: 0 25px 0 1px;
+      padding: 6px;
+
       img {
         vertical-align: -18%;
       }
     }
+
     a.action {
-      color: black;
+      color: $dark-gray;
       text-decoration: none;
+
       &:hover {
-        background: #d8d8d8;
-        background-image: linear-gradient(to bottom, #ffffff, #cccccc);
-        border: 1px solid #a5c9df;
+        background: $light-gray;
+        border: 1px solid darken($light-gray, 10%);
         margin: 0 24px 0 0;
-        border-radius: 5px;
       }
+
       &.selected {
-        background: #c5e0f5;
-        background-image: linear-gradient(to bottom, #e5f5ff, #c5e0ff);
-        border: 1px solid #a5c9df;
+        background: $light-gray;
+        border: 1px solid darken($light-gray, 10%);
         margin: 0 24px 0 0;
-        border-top-left-radius: 5px;
-        border-top-right-radius: 5px;
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
       }
     }
+
     span.action.disabled {
       color: #cccccc;
     }
+
     &.empty {
       color: silver;
-      font-size: 85%;
       font-style: italic;
       padding: 3em;
       text-align: center;
     }
+
     &.name {
-      font-size: 115%;
       font-weight: bold;
-      img {
-        vertical-align: center;
-      }
+
       a {
-        color: black;
+        color: $dark-gray;
         text-decoration: none;
-        &:hover {
-          color: #EC0673;
-          text-decoration: underline;
-        }
       }
     }
+
     &.actions {
       font-size: 85%;
       white-space: nowrap;
     }
   }
+
   tr {
     &:first-child {
       border-top: 1px solid white;
     }
+
     &.hover,
     &:hover {
       td {
-        border-top: 1px solid #d5f0ff;
-        border-bottom: 1px solid #c5dff5;
         background: #c5dff5;
-        background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
+        border-bottom: 1px solid #c5dff5;
+        border-top: 1px solid #d5f0ff;
       }
     }
   }
+
   thead {
     tr,
     tr:first-child {
@@ -117,57 +110,31 @@ table.index {
 }
 
 table.index#pages {
-  tr.page {
-    &.level_0 td.name {
-      font-size: 120%;
-      font-weight: bold;
-    }
-    &.level_1 td.name {
-      font-size: 115%;
-      font-weight: bold;
-    }
-    &.level_2 td.name {
-      font-size: 115%;
-    }
-    &.level_3 td.name {
-      font-size: 105%;
-    }
-  }
   td.name {
-    font-size: 105%;
-    a {
-      text-decoration: none;
-      .title {
-        color: black;
-        text-decoration: none;
-      }
-      &:hover .title {
-        color: #EC0673;
-        text-decoration: underline;
+    .w1 {
+      position: relative;
+
+      img.expander {
+        left: -25px;
+        padding: 6px 3px;
+        position: absolute;
       }
     }
+
     .info {
       color: #9eb3bf;
+      font-size: 0.90em;
       font-style: italic;
       font-weight: normal;
-      font-size: 90%;
     }
   }
+
   tr.page.virtual td.name a .title {
     color: #9eb3bf;
   }
-  td.name {
-    .w1 {
-      position: relative;
-      img.expander {
-        left: -25px;
-        position: absolute;
-        padding: 6px 3px;
-      }
-    }
-  }
+
   td.status {
-    font-size: 80%;
+    font-size: .80em;
   }
 }
 
@@ -178,7 +145,7 @@ table.index#pages {
 }
 
 .draft_status {
-  @include status-badge(#cc494c);
+  @include status-badge($red);
 }
 
 .hidden_status {
@@ -187,12 +154,14 @@ table.index#pages {
 
 table.index#users {
   td.name {
-    padding-top: 8px;
     padding-bottom: 8px;
+    padding-top: 8px;
+
     img.avatar {
       margin-right: 4px;
       vertical-align: center;
     }
+
     .login {
       color: #9eb3bf;
       font-size: 90%;

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

@@ -7,34 +7,39 @@
 div.textarea_toolbar {
   float: left;
   margin-bottom: 8px;
+
   span.separator {
-    padding: 0;
-    height: 6px;
-    width: 2px;
-    margin: 0 2px;
     border-left: solid 1px #d5d5d5;
     border-right: solid 1px whitesmoke;
+    height: 6px;
+    margin: 0 2px;
+    padding: 0;
+    width: 2px;
   }
+
   button,
   button.unselected {
-    margin: 0;
     background: none;
     border: none;
+    margin: 0;
     padding: 2px 0;
     text-align: center;
     width: 24px;
+
     img {
       vertical-align: text-bottom;
     }
   }
+
   button:hover,
   button.unselected:hover {
     border: 1px solid #999999;
     padding: 1px 0;
   }
+
   button.selected {
-    border: 1px solid #ce9100;
     background-color: white;
+    border: 1px solid #ce9100;
     padding: 1px 0;
   }
 }