changes

uditbhargava · Oct 11, 2018 · c41f6d9 · c41f6d9
1 parent 35479eb
commit c41f6d9
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 26 deletions.
diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,300italic,400italic' rel="stylesheet" type="text/css">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Vuetify Material Dashboard</title>
+    <title>Vuetify Material Dashboard by Creative Tim</title>
   </head>
   <body>
     <noscript>

diff --git a/src/components/core/Drawer.vue b/src/components/core/Drawer.vue
@@ -29,7 +29,7 @@
             />
           </v-list-tile-avatar>
           <v-list-tile-title class="title">
-            VUE MD
+            Vuetify MD
           </v-list-tile-title>
         </v-list-tile>
         <v-divider/>

diff --git a/src/components/core/Toolbar.vue b/src/components/core/Toolbar.vue
@@ -15,7 +15,7 @@
           class="default v-btn--simple"
           dark
           icon
-          @click.stop="onClick"
+          @click.stop="onClickBtn"
         >
           <v-icon>mdi-view-list</v-icon>
         </v-btn>
@@ -126,9 +126,12 @@ export default {
 
   methods: {
     ...mapMutations('app', ['setDrawer', 'toggleDrawer']),
-    onClick () {
+    onClickBtn () {
       this.setDrawer(!this.$store.state.app.drawer)
     },
+    onClick () {
+      //
+    },
     onResponsiveInverted () {
       if (window.innerWidth < 991) {
         this.responsive = true

diff --git a/src/components/core/View.vue b/src/components/core/View.vue
@@ -13,7 +13,7 @@
 export default {
   metaInfo () {
     return {
-      title: 'Vue Material Dashboard by CreativeTim'
+      title: 'Vuetify Material Dashboard by CreativeTim'
     }
   }
 }

diff --git a/src/components/material/StatsCard.vue b/src/components/material/StatsCard.vue
@@ -113,7 +113,6 @@ export default {
 
   .v-card__text {
     display: inline-block;
-    flex: 1 0 calc(100% - 120px);
     position: absolute;
     top: 0;
     right: 0;

diff --git a/src/styles/material-dashboard/_alerts.scss b/src/styles/material-dashboard/_alerts.scss
@@ -32,9 +32,17 @@
 
 .v-snack .v-snack__wrapper,
 .v-alert {
-  @include alert-shadow('info', $brand-info);
+  @include alert-shadow('info', lighten($brand-info, 5%));
   @include alert-shadow('success', $brand-success);
   @include alert-shadow('error', $brand-danger);
   @include alert-shadow('warning', $brand-warning);
   @include alert-shadow('purple', $brand-primary);
 }
+
+.v-snack {
+  @include notifications-color('info', lighten($brand-info, 5%));
+  @include notifications-color('success', $brand-success);
+  @include notifications-color('error', $brand-danger);
+  @include notifications-color('warning', $brand-warning);
+  @include notifications-color('purple', $brand-primary);
+}
diff --git a/src/styles/material-dashboard/_buttons.scss b/src/styles/material-dashboard/_buttons.scss
@@ -4,6 +4,7 @@
   font-size: $font-size-small;
   font-weight: $font-weight-base !important;
   height: auto;
+  line-height: $line-height-base;
   color: $white !important;
   border-radius: $border-radius-base;
 
@@ -45,19 +46,19 @@
     border-radius: 50%;
   }
 
-  &.green {
+  &.success {
     @include button-color($brand-success);
   }
 
   &.default {
     @include button-color($gray-light);
   }
 
-  &.purple {
+  &.primary {
     @include button-color($brand-primary);
   }
 
-  &.orange {
+  &.warning {
     @include button-color($brand-warning);
   }
 

diff --git a/src/styles/material-dashboard/_mixins.scss b/src/styles/material-dashboard/_mixins.scss
@@ -47,12 +47,26 @@
   }
 }
 
+@mixin toolbar-colors($color-name, $color) {
+  &.#{$color-name} {
+    background-color: $color !important;
+    @include shadow-big-color($color);
+  }
+}
+
 @mixin fixed-plugin-colors($color-name, $color) {
   &.color-#{$color-name}{
     background-color: $color;
   }
 }
 
+@mixin notifications-color($color-name, $color) {
+  .v-snack__wrapper.#{$color-name} {
+    background-color: $color !important;
+    border-color: $color !important
+  }
+}
+
 @mixin card-header-color($color, $shadow-color, $color-400, $color-600) {
   .v-card.#{$color} {
     background: linear-gradient(60deg, $color-400, $color-600) !important;

diff --git a/src/styles/material-dashboard/_toolbar.scss b/src/styles/material-dashboard/_toolbar.scss
@@ -1,5 +1,22 @@
 .v-toolbar {
   min-height: $toolbar-min-height;
+  border-radius: $border-radius-base;
+  margin-bottom: $margin-general;
+
+  @include toolbar-colors('bg-danger', $brand-danger);
+  @include toolbar-colors('bg-warning', $brand-warning);
+  @include toolbar-colors('bg-primary', $brand-primary);
+  @include toolbar-colors('bg-info', $brand-info);
+  @include toolbar-colors('bg-success', $brand-success);
+  @include toolbar-colors('bg-default', $gray-light);
+
+  &[class*="bg-"] {
+    .v-toolbar__title,
+    .v-btn__content,
+    .v-ripple__container {
+      color: $white !important;
+    }
+  }
 
   .v-toolbar__content {
     min-height: $toolbar-min-height;
@@ -9,6 +26,7 @@
     .v-toolbar__title {
       font-size: $font-size-toolbar-title;
       letter-spacing: unset;
+      color: $black-color;
     }
 
     .v-toolbar__items {
@@ -58,6 +76,6 @@
   }
 
   .v-content {
-    padding-top: 121px !important; 
+    padding-top: 121px !important;
   }
 }
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -246,7 +246,7 @@
                       <v-btn
                         slot="activator"
                         class="v-btn--simple"
-                        color="green"
+                        color="success"
                         icon
                       >
                         <v-icon color="primary">mdi-pencil</v-icon>
@@ -274,7 +274,7 @@
                   <v-list-tile-action>
                     <v-checkbox
                       :value="list[1]"
-                      color="green"
+                      color="success"
                     />
                   </v-list-tile-action>
                   <v-list-tile-title>
@@ -287,7 +287,7 @@
                       <v-btn
                         slot="activator"
                         class="v-btn--simple"
-                        color="green"
+                        color="success"
                         icon
                       >
                         <v-icon color="primary">mdi-pencil</v-icon>
@@ -314,7 +314,7 @@
                   <v-list-tile-action>
                     <v-checkbox
                       :value="list[2]"
-                      color="green"
+                      color="success"
                     />
                   </v-list-tile-action>
                   <v-list-tile-title>
@@ -327,7 +327,7 @@
                       <v-btn
                         slot="activator"
                         class="v-btn--simple"
-                        color="green"
+                        color="success"
                         icon
                       >
                         <v-icon color="primary">mdi-pencil</v-icon>

diff --git a/src/views/Icons.vue b/src/views/Icons.vue
@@ -47,7 +47,7 @@
       <v-btn
         large
         class="mx-0 font-weight-light"
-        color="green"
+        color="success"
         href="https://materialdesignicons.com/"
         target="_blank"
         round

diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
@@ -127,7 +127,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('top', 'left')"
                   >
                     Top Left
@@ -138,7 +138,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('top')"
                   >
                     Top Center
@@ -154,7 +154,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('top', 'right')"
                   >
                     Top Right
@@ -165,7 +165,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('bottom', 'left')"
                   >
                     Bottom Left
@@ -181,7 +181,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('bottom')"
                   >
                     Bottom Center
@@ -192,7 +192,7 @@
                   sm4>
                   <v-btn
                     block
-                    color="green"
+                    color="success"
                     @click="snack('bottom', 'right')"
                   >
                     Bottom Right
@@ -207,7 +207,6 @@
               :top="top"
               :left="left"
               :right="right"
-              :timeout="900000"
               v-model="snackbar"
               dark
             >

diff --git a/src/views/UserProfile.vue b/src/views/UserProfile.vue
@@ -103,7 +103,7 @@
                 >
                   <v-btn
                     class="mx-0 font-weight-light"
-                    color="green"
+                    color="success"
                   >
                     Update Profile
                   </v-btn>
@@ -132,7 +132,7 @@
             <h4 class="card-title font-weight-light">Alec Thompson</h4>
             <p class="card-description font-weight-light">Don't be scared of the truth because we need to restart the human foundation in truth And I love you like Kanye loves Kanye I love Rick Owens’ bed design but the back is...</p>
             <v-btn
-              color="green"
+              color="success"
               round
               class="font-weight-light"
             >Follow</v-btn>