Browse Source

more stuff. yay.

Daniel 8 years ago
parent
commit
85c7683dc8
6 changed files with 81 additions and 19 deletions
  1. 2 1
      compnor.php
  2. 13 0
      index.php
  3. 9 1
      stylesheets/sass/_content.scss
  4. 11 0
      stylesheets/sass/_news.scss
  5. 7 1
      stylesheets/sass/screen.scss
  6. 39 16
      stylesheets/screen.css

+ 2 - 1
compnor.php

@@ -28,7 +28,8 @@
             </div>
             <div class="body">
                 <ul class="top-menu">
-                    <li><a href="#">IRMS</a></li>
+                    <li class="fixed"><a href="index.php"><span class="fa fa-empire"></span></a></li>
+                    <li class="fixed"><a href="#"><span class="fa fa-database"></span></a></li>
                     <li><a href="#">COMPNOR</a></li>
                     <li><a href="#">Government</a></li>
                     <li><a href="#">Navy</a></li>

File diff suppressed because it is too large
+ 13 - 0
index.php


+ 9 - 1
stylesheets/sass/_content.scss

@@ -8,8 +8,16 @@
   }
 
   ul, ol {
-    list-style: disc outside;
+    list-style: square outside;
     padding-left: $pad;
   }
 
+  a, a:visited, a:active {
+    color: lighten($cMainText, 10%);
+    text-decoration: none;
+  }
+
+  a:hover {
+    color: lighten($cMainText, 30%);
+  }
 }

+ 11 - 0
stylesheets/sass/_news.scss

@@ -24,5 +24,16 @@
     }
 
     margin-bottom: 20px;
+
+    li {
+      font-size: small;
+
+      a {
+        //font-family: $fSerif;
+        font-variant: small-caps;
+        //font-size: medium;
+        text-shadow: 1px 1px 2px #111;
+      }
+    }
   }
 }

+ 7 - 1
stylesheets/sass/screen.scss

@@ -152,12 +152,17 @@ body {
       padding: 5px;
       padding-top: 7px;
       text-align: center;
-      width: 10px;
+      width: 40px;
       transition: all .3s ease;
       font-family: $fSerif;
       font-variant: small-caps;
       text-shadow: 1px 1px 2px #111;
 
+      &.fixed {
+        flex-grow: 0;
+        flex-shrink: 0;
+      }
+
       a {
         text-decoration: none;
         color: $cMainText;
@@ -265,6 +270,7 @@ body {
     background-color: $cContentBG;
     padding: $pad;
     @include clearfix;
+
   }
 
 }

+ 39 - 16
stylesheets/screen.css

@@ -193,9 +193,18 @@ body {
 }
 /* line 10, sass/_content.scss */
 #content ul, #content ol {
-  list-style: disc outside;
+  list-style: square outside;
   padding-left: 20px;
 }
+/* line 15, sass/_content.scss */
+#content a, #content a:visited, #content a:active {
+  color: #e6e6e6;
+  text-decoration: none;
+}
+/* line 20, sass/_content.scss */
+#content a:hover {
+  color: white;
+}
 
 /* line 1, sass/_box.scss */
 .box {
@@ -341,24 +350,29 @@ body {
   padding: 5px;
   padding-top: 7px;
   text-align: center;
-  width: 10px;
+  width: 40px;
   transition: all .3s ease;
   font-family: Vollkorn, serif;
   font-variant: small-caps;
   text-shadow: 1px 1px 2px #111;
 }
 /* line 161, sass/screen.scss */
+#title-bar .top-menu li.fixed {
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+/* line 166, sass/screen.scss */
 #title-bar .top-menu li a {
   text-decoration: none;
   color: #ccc;
   display: block;
 }
-/* line 167, sass/screen.scss */
+/* line 172, sass/screen.scss */
 #title-bar .top-menu li:hover {
   background-color: #444;
 }
 
-/* line 176, sass/screen.scss */
+/* line 181, sass/screen.scss */
 .menu a {
   text-decoration: none;
   font-style: italic;
@@ -366,12 +380,12 @@ body {
   color: #ccc;
   display: block;
 }
-/* line 184, sass/screen.scss */
+/* line 189, sass/screen.scss */
 .menu li {
   padding: 7px 0 5px 5px;
   transition: all .3s ease;
 }
-/* line 188, sass/screen.scss */
+/* line 193, sass/screen.scss */
 .menu li:before {
   content: "\f054";
   font-family: FontAwesome, serif;
@@ -381,33 +395,33 @@ body {
   transition: all 0.3s cubic-bezier(0.68, -0.55, 0.27, 1.55);
   color: transparent;
 }
-/* line 197, sass/screen.scss */
+/* line 202, sass/screen.scss */
 .menu li:hover {
   background-color: #444;
 }
-/* line 200, sass/screen.scss */
+/* line 205, sass/screen.scss */
 .menu li:hover:before {
   color: inherit;
   width: 12px;
 }
-/* line 206, sass/screen.scss */
+/* line 211, sass/screen.scss */
 .menu li.title {
   font-weight: bold;
 }
 
-/* line 212, sass/screen.scss */
+/* line 217, sass/screen.scss */
 #content {
   margin-left: 20px;
   margin-right: 20px;
   flex-grow: 1;
   width: 200px;
 }
-/* line 218, sass/screen.scss */
+/* line 223, sass/screen.scss */
 #content .content-header {
   text-align: center;
   border-bottom: 2px solid silver;
 }
-/* line 222, sass/screen.scss */
+/* line 227, sass/screen.scss */
 #content .content-header .pageTitle {
   text-align: center;
   margin: 0 auto;
@@ -422,13 +436,13 @@ body {
   text-shadow: 1px 1px 2px #111;
   color: #111;
 }
-/* line 240, sass/screen.scss */
+/* line 245, sass/screen.scss */
 #content .content-footer {
   text-align: center;
   border-top: 1px solid silver;
   clear: both;
 }
-/* line 245, sass/screen.scss */
+/* line 250, sass/screen.scss */
 #content .content-footer .copy {
   text-align: center;
   border-top: 15px solid silver;
@@ -442,12 +456,12 @@ body {
   font-size: x-small;
   color: #111;
 }
-/* line 257, sass/screen.scss */
+/* line 262, sass/screen.scss */
 #content .content-footer .copy div {
   position: relative;
   top: -14px;
 }
-/* line 264, sass/screen.scss */
+/* line 269, sass/screen.scss */
 #content .content-body {
   background-color: #222;
   padding: 20px;
@@ -479,3 +493,12 @@ body {
 .news-list .news-item .body {
   text-align: justify;
 }
+/* line 28, sass/_news.scss */
+.news-list .news-item li {
+  font-size: small;
+}
+/* line 31, sass/_news.scss */
+.news-list .news-item li a {
+  font-variant: small-caps;
+  text-shadow: 1px 1px 2px #111;
+}