few more minor changes

debashish4 · May 14, 2016 · 43507d7 · 43507d7
1 parent 5773a92
commit 43507d7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 56 deletions.
diff --git a/app/images/cream_pixels.png b/app/images/cream_pixels.png
diff --git a/app/images/jp.png b/app/images/jp.png
diff --git a/app/index.html b/app/index.html
@@ -25,10 +25,10 @@
                 <a href=" " class="brand-logo center ">
                     <img src="images/jp.png " alt="Just Play ">
                 </a>
-                <div class="right ">
-                    <ul>
-                        <li><a href=" ">Login</a></li>
-                        <li><a href=" ">Register</a></li>
+                <div class="right">
+                    <ul class="register">
+                        <li><a href="javascript:void(0)">Login</a></li>
+                        <li><a href="javascript:void(0)">Register</a></li>
                     </ul>
                 </div>
             </div>

diff --git a/app/pages/index.nunjucks b/app/pages/index.nunjucks
@@ -9,10 +9,10 @@
                 <a href=" " class="brand-logo center ">
                     <img src="images/jp.png " alt="Just Play ">
                 </a>
-                <div class="right ">
-                    <ul>
-                        <li><a href=" ">Login</a></li>
-                        <li><a href=" ">Register</a></li>
+                <div class="right">
+                    <ul class="register">
+                        <li><a href="javascript:void(0)">Login</a></li>
+                        <li><a href="javascript:void(0)">Register</a></li>
                     </ul>
                 </div>
             </div>

diff --git a/app/partials/navbar.nunjucks b/app/partials/navbar.nunjucks
@@ -1,38 +0,0 @@
-<nav class="navbar navbar-inverse navbar-fixed-top">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <a class="navbar-brand" href="#">
-                <img alt="Brand" src="images/Bally_Logo.svg" />
-            </a>
-            <div ng-if="!$root.inView" class="out-view">
-                <ul class="nav navbar-nav pull-right ">
-                    <li>
-                        <a href="javascript:void(0)"><i class="icon-icon_Help"></i></a>
-                    </li>
-                    <li>
-                        <a href="javascript:void(0)" ng-click="languageModelOpen()"><i class="icon-icon_Language icon-help"></i></a>
-                    </li>
-                </ul>
-                <a href="#" class="brand">
-                    <img alt="Brand" src="images/TableView_Logo.svg" />
-                </a>
-            </div>
-            <div ng-if="$root.inView" class="in-view">
-                <ul class="nav navbar-nav primary-actions">
-                    <li><a href="" class="active">Home</a></li>
-                    <li><a href="">Dashboard</a></li>
-                    <li><a href="">Tables</a></li>
-                    <li><a href="">Players</a></li>
-                </ul>
-                <ul class="nav navbar-nav global-actions pull-right">
-                    <li class="calculator"><a href="#"><i class="icon-icon_Calc"></i></a></li>
-                    <li><a href="#"><i class="icon-icon_Massage"></i></a></li>
-                    <li><a href="#"><i class="icon-icon_Alert"></i></a></li>
-                    <li><a href="#"><i class="icon-icon_Notifications"></i></a></li>
-                    <li class="profile"><a href="#"><i class="icon-icon_User"></i></a></li>
-                    <li class="humberger"><a href="#"><i class="icon-icon_Menu"></i></a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</nav>

diff --git a/app/styles/base/_common.scss b/app/styles/base/_common.scss
@@ -41,7 +41,7 @@ nav {
     ul{
         li{
             a{
-                color:#007095 !important;
+                color:#007095;
             }
         }
     }

diff --git a/app/styles/base/_navbar.scss b/app/styles/base/_navbar.scss
@@ -4,7 +4,7 @@
 .navbar {
     width: 200px;
     float: left;
-    box-shadow: 11px 3px 28px -10px rgba(0,0,0,0.5);
+    box-shadow: 11px 3px 28px -10px rgba(0, 0, 0, 0.5);
     height: calc(100% - 64px);
     ul {
         font-size: 1.1em;
@@ -56,16 +56,14 @@
         transition: box-shadow .6s ease-in-out;
     }
 }
-// END NAVBAR
-
 
+// END NAVBAR
 .navbar li a:hover,
 .navbar li a:active,
 .navbar li a:focus {
     border-bottom: 4px solid #A73C28;
 }
 
-
 a,
 button {
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
@@ -116,9 +114,12 @@ button {
     height: calc(100% - 64px);
 }
 
-
 //-------------------------- TOP NAV-------------------
-
-.nav-wrapper{
+.nav-wrapper {
     background: #F16B48;
-}
+    .register {
+        a {
+            color: #fff;
+        }
+    }
+}
diff --git a/app/styles/styles.css b/app/styles/styles.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ nav { @@
         ul{
             li{
                 a{
-                    color:#007095 !important;
+                    color:#007095;
                 }
             }
         }
@@ Expand Down @@