Halaman utama Jelajahi Bantuan
Masuk
tigerphp
/
stagfe
4
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

Merge branch 'dev' of rav.triplestart.com:Josh/stagfe into dev

= 4 tahun lalu
induk
2c972ba8ae 4ad7ad7b0e
melakukan
f60a01d48d
12 mengubah file dengan 30 tambahan dan 22 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 7 4
      public/css/theme.css
  2. 2 0
      public/images/logo.svg
  3. 2 0
      public/images/logo_white.svg
  4. 4 4
      resources/views/TEST/pro-logged-in.blade.php
  5. 2 2
      resources/views/layouts/client-login.blade.php
  6. 1 1
      resources/views/layouts/client.blade.php
  7. 1 1
      resources/views/layouts/guest-home.blade.php
  8. 2 2
      resources/views/layouts/join.blade.php
  9. 2 2
      resources/views/layouts/login.blade.php
  10. 1 1
      resources/views/layouts/meeting.blade.php
  11. 4 3
      resources/views/layouts/pro-logged-in.blade.php
  12. 2 2
      resources/views/layouts/pro.blade.php

+ 7 - 4
public/css/theme.css
Tampilan Berkas 

@@ -4,8 +4,8 @@ body * {
 
 nav.main-header.navbar {
 
     background: white; /* Old browsers */
 
     /*
 
-    background: -moz-linear-gradient(top,  gray 0%, gray 100%); /* FF3.6-15 
-    background: -webkit-linear-gradient(top,  gray 0%,gray 100%); /* Chrome10-25,Safari5.1-6 
+    background: -moz-linear-gradient(top,  gray 0%, gray 100%); /* FF3.6-15
 
+    background: -webkit-linear-gradient(top,  gray 0%,gray 100%); /* Chrome10-25,Safari5.1-6
 
     background: linear-gradient(to bottom,  gray 0%,gray 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+
 
     */
 
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fffcfc', endColorstr='#b0cee7',GradientType=0 ); /* IE6-9 */
 
@@ -55,7 +55,7 @@ nav.main-header.navbar .stag-search-form {
 
 aside.main-sidebar>.brand-link {
 
     height: 37px;
 
     padding: 0 0.5rem;
 
-    line-height: 37px;
 
+    line-height: 34px;
 
 }
 
 aside.main-sidebar>.brand-link>img {
 
     opacity: .8;
 
@@ -230,4 +230,7 @@ Sal
 
 .brand-text {
 
     font-weight: bold;
 
     font-size: 18px;
 
-}
 
+}
 
+.brand-text>img{
 
+    max-width: 180px;
 
+}

File diff ditekan karena terlalu besar
+ 2 - 0
public/images/logo.svg


File diff ditekan karena terlalu besar
+ 2 - 0
public/images/logo_white.svg


+ 4 - 4
resources/views/TEST/pro-logged-in.blade.php
Tampilan Berkas 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <!-- Font Awesome -->
 
@@ -66,9 +66,9 @@
 
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
 
         <!-- Brand Logo -->
 
         <a href="/AdminLTE-3.0.5/index3.html" class="brand-link">
 
-            <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
 
-                 style="opacity: .8">
 
-            <span class="brand-text font-weight-light">Scholar</span>
 
+            <span class="brand-text font-weight-light">
 
+                <img src="/images/logo_white.svg" alt="Leadership Health">
 
+            </span>
 
         </a>
 
 
         <!-- Sidebar -->

+ 2 - 2
resources/views/layouts/client-login.blade.php
Tampilan Berkas 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 
@@ -50,7 +50,7 @@
 
     <div class="login-logo auth-branding text-center border-0">
 
         <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
 
              style="opacity: .8">
 
-        <span class="brand-text font-weight-light text-white">Scholar</span>
 
+        <span class="brand-text font-weight-light text-white">Leadership Health</span>
 
     </div>
 
     <!-- /.login-logo -->
 
     <div class="card">

+ 1 - 1
resources/views/layouts/client.blade.php
Tampilan Berkas 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <!-- CSRF Token -->
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">

+ 1 - 1
resources/views/layouts/guest-home.blade.php
Tampilan Berkas 

@@ -4,7 +4,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
 
     <!-- Fonts -->
 
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600,700" rel="stylesheet">

+ 2 - 2
resources/views/layouts/join.blade.php
Tampilan Berkas 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 
@@ -57,7 +57,7 @@
 
     <div class="login-logo auth-branding text-center border-0">
 
         <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
 
              style="opacity: .8">
 
-        <span class="brand-text font-weight-light text-white">Scholar</span>
 
+        <span class="brand-text font-weight-light text-white">Leadership Health</span>
 
     </div>
 
     <!-- /.login-logo -->
 
     <div class="card">

+ 2 - 2
resources/views/layouts/login.blade.php
Tampilan Berkas 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 
@@ -50,7 +50,7 @@
 
     <div class="login-logo auth-branding text-center border-0">
 
         <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
 
              style="opacity: .8">
 
-        <span class="brand-text font-weight-light text-white">Scholar</span>
 
+        <span class="brand-text font-weight-light text-white">Leadership Health</span>
 
     </div>
 
     <!-- /.login-logo -->
 
     <div class="card">

+ 1 - 1
resources/views/layouts/meeting.blade.php
Tampilan Berkas 

@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
 
     <!-- Fonts -->
 
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600,700" rel="stylesheet">

+ 4 - 3
resources/views/layouts/pro-logged-in.blade.php
Tampilan Berkas 

@@ -5,7 +5,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
     <!-- Tell the browser to be responsive to screen width -->
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <!-- Font Awesome -->
 
@@ -119,8 +119,9 @@
 
         <aside class="main-sidebar sidebar-light-primary elevation-4">
 
             <!-- Brand Logo -->
 
             <a href="#" class="brand-link">
 
-                <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
 
-                <span class="brand-text font-weight-light">Scholar</span>
 
+                <span class="brand-text font-weight-light">
 
+                    <img src="/images/logo.svg" alt="Leadership Health">
 
+                </span>
 
             </a>
 
 
             <!-- Sidebar -->

+ 2 - 2
resources/views/layouts/pro.blade.php
Tampilan Berkas 

@@ -6,7 +6,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
 
-    <title>Scholar</title>
 
+    <title>Leadership Health</title>
 
 
     <!-- Fonts -->
 
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600,700" rel="stylesheet">
 
@@ -33,7 +33,7 @@
 
 
 <body class="p-0 m-0">
 
     <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
 
-        <a class="navbar-brand" href="#">Scholar</a>
 
+        <a class="navbar-brand" href="#">Leadership Health</a>
 
         <button class="navbar-toggler d-lg-none" type="button" data-toggle="collapse" data-target="#collapsibleNavId"
 
             aria-controls="collapsibleNavId" aria-expanded="false" aria-label="Toggle navigation"></button>
 
         <div class="collapse navbar-collapse" id="collapsibleNavId">

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini