Added icons

Fixed authentication buttons
diana-deliu · Apr 30, 2015 · fce9c8b · fce9c8b
1 parent 60f90b7
commit fce9c8b
Show file tree

Hide file tree

Showing 42 changed files with 359 additions and 126 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css
@@ -1447,6 +1447,7 @@ figure {
 
 img {
     vertical-align: middle;
+    padding: 7px;
 }
 
 .img-responsive,
@@ -4782,8 +4783,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 
 .nav > li > a:hover,
 .nav > li > a:focus {
-    text-decoration: none;
-    background-color: #eeeeee;
+    background-color: #000000;
+    color: #ffffff !important;
 }
 
 .nav > li.disabled > a {
@@ -5415,8 +5416,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 
 .navbar-default .navbar-nav > li > a:hover,
 .navbar-default .navbar-nav > li > a:focus {
-    color: #212121;
-    background-color: transparent;
+    -webkit-box-shadow: inset 0 0 30px rgba(0, 0, 0, .2);
+    -moz-box-shadow: inset 0 0 30px rgba(0, 0, 0, .2);
+    box-shadow: inset 0 0 30px rgba(0, 0, 0, .2);
 }
 
 .navbar-default .navbar-nav > .active > a,

diff --git a/public/css/style.css b/public/css/style.css
@@ -27,8 +27,7 @@ body {
     font-size: 40px;
     font-family: 'Poiret One', cursive;
     float: left;
-    font-weight: bold;
-    border-right: 20px solid #ff5757;
+    /*font-weight: bold;*/
 }
 
 .navbar-inner .logo-textbox a {
@@ -37,13 +36,13 @@ body {
 
 .navbar-inner .logo-textbox p {
     padding: 0 10px 0 10px;
-    margin: 15px 0 0 0;
+    margin: 15px 0;
     line-height: 40px;
     vertical-align: bottom;
 }
 
 .navbar-inner .logo-textbox span {
-    padding: 0 10px 0 10px;
+    padding: 0 10px 0 30px;
     font-size: 10px;
     font-family: "Open Sans", sans-serif;
     margin: 0;
@@ -58,7 +57,6 @@ body {
     height: 90px;
     float: left;
     display: table;
-    border-right: 20px solid #ff5757;
 }
 
 .navbar .logo-box img {
@@ -102,16 +100,16 @@ body {
 }
 
 .top-menu .navbar-nav > li {
-    height: 49px;
+    height: 90px;
 }
 
 .top-menu .navbar-nav > li > a {
     display: block;
-    padding: 20px 18px;
+    padding: 0px 18px;
     color: #5f5f5f;
     border: none;
     position: relative;
-    line-height: 20px;
+    line-height: 90px;
 }
 
 /* Sidebar */

diff --git a/public/favicon_images/android-icon-144x144.png b/public/favicon_images/android-icon-144x144.png
diff --git a/public/favicon_images/android-icon-192x192.png b/public/favicon_images/android-icon-192x192.png
diff --git a/public/favicon_images/android-icon-36x36.png b/public/favicon_images/android-icon-36x36.png
diff --git a/public/favicon_images/android-icon-48x48.png b/public/favicon_images/android-icon-48x48.png
diff --git a/public/favicon_images/android-icon-72x72.png b/public/favicon_images/android-icon-72x72.png
diff --git a/public/favicon_images/android-icon-96x96.png b/public/favicon_images/android-icon-96x96.png
diff --git a/public/favicon_images/apple-icon-114x114.png b/public/favicon_images/apple-icon-114x114.png
diff --git a/public/favicon_images/apple-icon-120x120.png b/public/favicon_images/apple-icon-120x120.png
diff --git a/public/favicon_images/apple-icon-144x144.png b/public/favicon_images/apple-icon-144x144.png
diff --git a/public/favicon_images/apple-icon-152x152.png b/public/favicon_images/apple-icon-152x152.png
diff --git a/public/favicon_images/apple-icon-180x180.png b/public/favicon_images/apple-icon-180x180.png
diff --git a/public/favicon_images/apple-icon-57x57.png b/public/favicon_images/apple-icon-57x57.png
diff --git a/public/favicon_images/apple-icon-60x60.png b/public/favicon_images/apple-icon-60x60.png
diff --git a/public/favicon_images/apple-icon-72x72.png b/public/favicon_images/apple-icon-72x72.png
diff --git a/public/favicon_images/apple-icon-76x76.png b/public/favicon_images/apple-icon-76x76.png
diff --git a/public/favicon_images/apple-icon-precomposed.png b/public/favicon_images/apple-icon-precomposed.png
diff --git a/public/favicon_images/apple-icon.png b/public/favicon_images/apple-icon.png
diff --git a/public/favicon_images/favicon-16x16.png b/public/favicon_images/favicon-16x16.png
diff --git a/public/favicon_images/favicon-32x32.png b/public/favicon_images/favicon-32x32.png
diff --git a/public/favicon_images/favicon-96x96.png b/public/favicon_images/favicon-96x96.png
diff --git a/public/favicon_images/favicon.ico b/public/favicon_images/favicon.ico
diff --git a/public/favicon_images/ms-icon-144x144.png b/public/favicon_images/ms-icon-144x144.png
diff --git a/public/favicon_images/ms-icon-150x150.png b/public/favicon_images/ms-icon-150x150.png
diff --git a/public/favicon_images/ms-icon-310x310.png b/public/favicon_images/ms-icon-310x310.png
diff --git a/public/favicon_images/ms-icon-70x70.png b/public/favicon_images/ms-icon-70x70.png
diff --git a/public/images/chart_blue_30.png b/public/images/chart_blue_30.png
diff --git a/public/images/doctor_blue_20.png b/public/images/doctor_blue_20.png
diff --git a/public/images/doctor_blue_30.png b/public/images/doctor_blue_30.png
diff --git a/public/images/heart_final_100.png b/public/images/heart_final_100.png
diff --git a/public/images/injured_orange_30.png b/public/images/injured_orange_30.png
diff --git a/public/images/lab_green_30.png b/public/images/lab_green_30.png
diff --git a/public/images/medicine_green_30.png b/public/images/medicine_green_30.png
diff --git a/public/images/notification_red_30.png b/public/images/notification_red_30.png
diff --git a/public/images/pacient_orange_30.png b/public/images/pacient_orange_30.png
diff --git a/public/images/recommendation_orange_30.png b/public/images/recommendation_orange_30.png
diff --git a/public/images/registry_red_30.png b/public/images/registry_red_30.png
diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php
@@ -5,6 +5,5 @@
     @include('partials.left_sidebar')
 
     <div class="main_container">
-        <h2>Bine ati venit, domnule doctor!</h2>
     </div>
 @stop
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
@@ -6,27 +6,33 @@
     <link rel="stylesheet" href="{{ asset('css/bootstrap.css') }}"/>
     <link rel="stylesheet" href="{{ asset('css/style.css') }}"/>
     <link rel="stylesheet" href="{{ asset('css/white.css') }}"/>
-    <link rel="apple-touch-icon" sizes="60x60" href="{{ asset('favicon_images/apple-icon-60x60.png') }}"/>
-    <link rel="icon" type="image/png" sizes="16x16" href="{{ asset('favicon_images/favicon-16x16.png') }}"/>
+    <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-96x96.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/manifest.json">
+    <link rel="shortcut icon" href="{{ asset('favicon_images/favicon.ico') }}"
+    <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
-    <link rel="shortcut icon" href="{{ asset('http://licenta.local/favicon_images/favicon.ico') }}"/>
     <meta name="theme-color" content="#ffffff">
-    <title>SimfoMed - Medicină de familie</title>
+    <title>GPRegistrar - Cea mai la îndemână aplicație pentru medici și pacienți!</title>
 </head>
 <body>
 <div class="navbar">
     <div class="navbar-inner">
         <div class="logo-box">
             <a href="{{ url('/') }}" class="logo-text">
-                <span><a href="{{ url('/') }}" title="SimfoMed" class="logo">
+                <span><a href="{{ url('/') }}" title="GPRegistrar" class="logo">
                         <img src="{{ asset('images/heart_final_100.png') }}"/>
                     </a></span>
             </a>
         </div>
         <div class="logo-textbox">
             <a href="{{ url('/') }}">
-                <p>SimfoMed</p>
-                <span>Sănătatea dumneavoastră - simfonie pentru noi!</span>
+                <p><strong>gp</strong>Registrar</p>
+                <span>Cea mai la îndemână aplicație pentru medici și pacienți!</span>
             </a>
         </div>
         <div class="topmenu-outer">

diff --git a/resources/views/partials/left_sidebar.blade.php b/resources/views/partials/left_sidebar.blade.php
@@ -6,14 +6,61 @@
         <ul class="menu accordion-menu">
             <li class="active">
                 <a href="#">
-                    <p>Administrare medici</p>                   </p>
+                    <img src="{{ asset('images/doctor_blue_30.png') }}"/>
+
+                    <p>Medici</p>
                 </a>
             </li>
             <li>
                 <a href="#">
-                    <p>Administrare pacienti</p>
+                    <img src="{{ asset('images/pacient_orange_30.png') }}"/>
+
+                    <p>Pacienți</p>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/lab_green_30.png') }}"/>
+
+                    <p>Analize</p>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/registry_red_30.png') }}"/>
+
+                    <p>Fișe medicale</p>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/chart_blue_30.png') }}"/>
+
+                    <p>Grafice</p>
                 </a>
             </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/recommendation_orange_30.png') }}"/>
+
+                    <p>Recomandări</p>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/medicine_green_30.png') }}"/>
+
+                    <p>Medicamente</p>
+                </a>
+            </li>
+            <li>
+                <a href="#">
+                    <img src="{{ asset('images/notification_red_30.png') }}"/>
+
+                    <p>Notificări</p>
+                </a>
+            </li>
+
         </ul>
     </div>
 </div>