Parcourir la source

Added SWC link.

Daniel il y a 8 ans
Parent
commit
1b5706d02a
6 fichiers modifiés avec 55 ajouts et 39 suppressions
  1. 1 0
      .gitignore
  2. 2 1
      compnor.php
  3. 3 2
      index.php
  4. 3 2
      stylesheets/sass/_colors.scss
  5. 7 1
      stylesheets/sass/screen.scss
  6. 39 33
      stylesheets/screen.css

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+.sass-cache/

+ 2 - 1
compnor.php

@@ -31,6 +31,7 @@
                     <li class="fixed"><a href="index.php"><span class="fa fa-empire"></span></a></li>
                     <li class="fixed" title="IRMS"><a href="#"><span class="fa fa-database"></span></a></li>
                     <li class="fixed" title="COMMCENT"><a href="#"><span class="fa fa-comments"></span></a></li>
+                    <li class="fixed" title="Star Wars Combine"><a href="#" class="swc-link">SWC</a></li>
                     <li><a href="#">COMPNOR</a></li>
                     <li><a href="#">Government</a></li>
                     <li><a href="#">Navy</a></li>
@@ -110,4 +111,4 @@
     </div>
     </div>
 </body>
-</html>
+</html>

+ 3 - 2
index.php

@@ -29,13 +29,14 @@
             <div class="body">
                 <ul class="top-menu">
                     <li class="fixed"><a href="index.php"><span class="fa fa-empire"></span></a></li>
+                    <li class="fixed" title="COMMCENT"><a href="#"><span class="fa fa-comments"></span></a></li>
+                    <li class="fixed" title="Star Wars Combine"><a href="#" class="swc-link">SWC</a></li>
                     <li><a href="compnor.php">COMPNOR</a></li>
                     <li><a href="#">Government</a></li>
                     <li><a href="#">Navy</a></li>
                     <li><a href="#">Army</a></li>
                     <li><a href="#">Intelligence</a></li>
                     <li><a href="#">Industry</a></li>
-                    <li><a href="#">COMMCENT</a></li>
                 </ul>
             </div>
         </div>
@@ -124,4 +125,4 @@
         </div>
     </div>
 </body>
-</html>
+</html>

+ 3 - 2
stylesheets/sass/_colors.scss

@@ -7,7 +7,8 @@
   $cContentBG: #222;
 
   //$cMenuOutline: darken(orange, 10%); COMPNOR
-  $cMenuOutline: SteelBlue;
+  //$cMenuOutline: SteelBlue;
+  $cMenuOutline: Silver;
   $cMenuBG: #333;
   $cMenuHover: #444;
-  $cBoxHeading: #111;
+  $cBoxHeading: #111;

+ 7 - 1
stylesheets/sass/screen.scss

@@ -75,7 +75,7 @@ body {
 
 #title-bar {
   margin: 20px;
-  
+
   background: radial_gradient(transparent, transparentize($cMainBG, .2) 60%, $cMainBG 70%) no-repeat center, url("../bg-navy.png") no-repeat center;
   background-size: 853px, auto;
 
@@ -170,6 +170,12 @@ body {
         display: block;
       }
 
+      .swc-link {
+        font-size: smaller;
+        font-family: $fSansSerif;
+        font-style: italic;
+      }
+
       &:hover {
         background-color: $cMenuHover;
       }

+ 39 - 33
stylesheets/screen.css

@@ -3,7 +3,7 @@
  * Import this file using the following HTML or equivalent:
  * <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
 @import url(https://fonts.googleapis.com/css?family=Noto+Sans:400,400italic,700|Vollkorn);
-/* line 5, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 5, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -25,45 +25,45 @@ time, mark, audio, video {
   vertical-align: baseline;
 }
 
-/* line 22, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 22, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 html {
   line-height: 1;
 }
 
-/* line 24, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 24, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 ol, ul {
   list-style: none;
 }
 
-/* line 26, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 26, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
 
-/* line 28, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 28, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 caption, th, td {
   text-align: left;
   font-weight: normal;
   vertical-align: middle;
 }
 
-/* line 30, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 30, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 q, blockquote {
   quotes: none;
 }
-/* line 103, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 103, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 q:before, q:after, blockquote:before, blockquote:after {
   content: "";
   content: none;
 }
 
-/* line 32, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 32, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 a img {
   border: none;
 }
 
-/* line 116, ../../../../../home/daniel/.gem/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
+/* line 116, C:/Ruby23/lib/ruby/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
   display: block;
 }
@@ -215,7 +215,7 @@ body {
 .box .title {
   padding-left: 5px;
   padding-right: 5px;
-  border-bottom: 30px solid SteelBlue;
+  border-bottom: 30px solid Silver;
   border-right: 20px solid transparent;
   display: inline-block;
   height: 0;
@@ -227,8 +227,8 @@ body {
 }
 /* line 20, sass/_box.scss */
 .box .body {
-  border-top: 2px solid SteelBlue;
-  border-bottom: 1px solid SteelBlue;
+  border-top: 2px solid Silver;
+  border-bottom: 1px solid Silver;
   background-color: #333;
 }
 /* line 26, sass/_box.scss */
@@ -250,7 +250,7 @@ body {
 }
 /* line 41, sass/_box.scss */
 .box-center .title {
-  border-bottom: 30px solid SteelBlue;
+  border-bottom: 30px solid Silver;
   border-right: 20px solid transparent;
   border-left: 20px solid transparent;
 }
@@ -266,7 +266,7 @@ body {
 }
 /* line 56, sass/_box.scss */
 .box-right .title {
-  border-bottom: 30px solid SteelBlue;
+  border-bottom: 30px solid Silver;
   border-left: 20px solid transparent;
   border-right: none;
 }
@@ -307,7 +307,7 @@ body {
 #title-bar .titles .left {
   padding-left: 5px;
   padding-right: 5px;
-  border-bottom: 20px solid SteelBlue;
+  border-bottom: 20px solid Silver;
   border-right: 15px solid transparent;
   display: inline-block;
   height: 0;
@@ -320,7 +320,7 @@ body {
 #title-bar .titles .right {
   padding-left: 5px;
   padding-right: 5px;
-  border-bottom: 20px solid SteelBlue;
+  border-bottom: 20px solid Silver;
   border-left: 15px solid transparent;
   display: inline-block;
   height: 0;
@@ -369,11 +369,17 @@ body {
   display: block;
 }
 /* line 173, sass/screen.scss */
+#title-bar .top-menu li .swc-link {
+  font-size: smaller;
+  font-family: "Noto Sans", Verdana, sans-serif;
+  font-style: italic;
+}
+/* line 179, sass/screen.scss */
 #title-bar .top-menu li:hover {
   background-color: #444;
 }
 
-/* line 182, sass/screen.scss */
+/* line 188, sass/screen.scss */
 .menu a {
   text-decoration: none;
   font-style: italic;
@@ -381,12 +387,12 @@ body {
   color: #ccc;
   display: block;
 }
-/* line 190, sass/screen.scss */
+/* line 196, sass/screen.scss */
 .menu li {
   padding: 7px 0 5px 5px;
   transition: all .3s ease;
 }
-/* line 194, sass/screen.scss */
+/* line 200, sass/screen.scss */
 .menu li:before {
   content: "\f054";
   font-family: FontAwesome, serif;
@@ -396,37 +402,37 @@ body {
   transition: all 0.3s cubic-bezier(0.68, -0.55, 0.27, 1.55);
   color: transparent;
 }
-/* line 203, sass/screen.scss */
+/* line 209, sass/screen.scss */
 .menu li:hover {
   background-color: #444;
 }
-/* line 206, sass/screen.scss */
+/* line 212, sass/screen.scss */
 .menu li:hover:before {
   color: inherit;
   width: 12px;
 }
-/* line 212, sass/screen.scss */
+/* line 218, sass/screen.scss */
 .menu li.title {
   font-weight: bold;
 }
 
-/* line 218, sass/screen.scss */
+/* line 224, sass/screen.scss */
 #content {
   margin-left: 20px;
   margin-right: 20px;
   flex-grow: 1;
   width: 200px;
 }
-/* line 224, sass/screen.scss */
+/* line 230, sass/screen.scss */
 #content .content-header {
   text-align: center;
-  border-bottom: 2px solid SteelBlue;
+  border-bottom: 2px solid Silver;
 }
-/* line 228, sass/screen.scss */
+/* line 234, sass/screen.scss */
 #content .content-header .pageTitle {
   text-align: center;
   margin: 0 auto;
-  border-bottom: 30px solid SteelBlue;
+  border-bottom: 30px solid Silver;
   border-right: 20px solid transparent;
   border-left: 20px solid transparent;
   display: inline-block;
@@ -437,16 +443,16 @@ body {
   text-shadow: 1px 1px 2px #111;
   color: #111;
 }
-/* line 246, sass/screen.scss */
+/* line 252, sass/screen.scss */
 #content .content-footer {
   text-align: center;
-  border-top: 1px solid SteelBlue;
+  border-top: 1px solid Silver;
   clear: both;
 }
-/* line 251, sass/screen.scss */
+/* line 257, sass/screen.scss */
 #content .content-footer .copy {
   text-align: center;
-  border-top: 15px solid SteelBlue;
+  border-top: 15px solid Silver;
   border-right: 10px solid transparent;
   border-left: 10px solid transparent;
   display: inline-block;
@@ -457,12 +463,12 @@ body {
   font-size: x-small;
   color: #111;
 }
-/* line 263, sass/screen.scss */
+/* line 269, sass/screen.scss */
 #content .content-footer .copy div {
   position: relative;
   top: -14px;
 }
-/* line 270, sass/screen.scss */
+/* line 276, sass/screen.scss */
 #content .content-body {
   background-color: #222;
   padding: 20px;