sean/manja_ui_dev
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19 from mrholek/v1-0-1

Browse Source 
v1.0.1
This commit is contained in:
xidedix
2017-10-10 17:50:54 +02:00
committed by GitHub
parent 0a00ed0646 b500475980
commit 96f2affe25
25 changed files with 101 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vue_Full_Project/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@coreui/vue", "name": "@coreui/vue",
"version": "1.0.0", "version": "1.0.1",
"description": "", "description": "",
"author": "Łukasz Holeczek <lukasz@holeczek.pl>", "author": "Łukasz Holeczek <lukasz@holeczek.pl>",
"private": true, "private": true,
Vue_Full_Project/scss/core/_dropdown-menu-right.scss
+5 -4
View File
@@ -1,7 +1,8 @@
// Temp fix for reactstrap // Temp fix for reactstrap
.show { .app-header {
> .dropdown-menu-right { .navbar-nav {
right: 0; .dropdown-menu-right {
left: auto; // Reset the default from `.dropdown-menu` right: auto;
}
} }
} }
Vue_Full_Project/scss/core/_footer.scss
+3 -2
View File
@@ -1,8 +1,9 @@
.app-footer { .app-footer {
min-height: $footer-height; display: flex;
padding: 0 $spacer; padding: 0 $spacer;
line-height: $footer-height;
color: $footer-color; color: $footer-color;
background: $footer-bg; background: $footer-bg;
flex-wrap: wrap;
align-items: center;
@include borders($footer-borders); @include borders($footer-borders);
} }
Vue_Full_Project/scss/core/_layout.scss
+5 -4
View File
@@ -11,8 +11,8 @@
app-dashboard, app-dashboard,
app-root { app-root {
display: flex; display: flex;
flex-direction: column;
min-height: 100vh; min-height: 100vh;
flex-direction: column;
} }
.app-header { .app-header {
@@ -26,12 +26,12 @@ app-root {
.app-body { .app-body {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-grow: 1;
overflow-x: hidden; overflow-x: hidden;
flex-grow: 1;
.main { .main {
flex: 1;
min-width: 0; min-width: 0;
flex: 1;
} }
.sidebar { .sidebar {
@@ -328,7 +328,8 @@ app-root {
margin-top: $navbar-height; margin-top: $navbar-height;
} }
.sidebar { .sidebar,
.sidebar-fixed .sidebar {
position: fixed; position: fixed;
z-index: $zindex-sticky - 1; z-index: $zindex-sticky - 1;
width: $mobile-sidebar-width; width: $mobile-sidebar-width;
Vue_Full_Project/scss/core/_navbar.scss
+4 -1
View File
@@ -1,7 +1,7 @@
.app-header.navbar { .app-header.navbar {
position: relative; position: relative;
flex-direction: row;
height: $navbar-height; height: $navbar-height;
flex-direction: row;
padding: 0; padding: 0;
margin: 0; margin: 0;
background-color: $navbar-bg; background-color: $navbar-bg;
@@ -102,6 +102,7 @@
background-color: rgba(0,0,0,.075); background-color: rgba(0,0,0,.075);
} }
@include media-breakpoint-up(lg) {
.brand-minimized { .brand-minimized {
.app-header.navbar { .app-header.navbar {
.navbar-brand { .navbar-brand {
@@ -109,6 +110,8 @@
background-color: $navbar-brand-minimized-bg; background-color: $navbar-brand-minimized-bg;
background-image: $navbar-brand-minimized-logo; background-image: $navbar-brand-minimized-logo;
background-size: $navbar-brand-minimized-logo-size; background-size: $navbar-brand-minimized-logo-size;
@include borders($navbar-brand-minimized-border);
}
} }
} }
} }
Vue_Full_Project/scss/core/_sidebar.scss
+3 -1
View File
@@ -78,8 +78,8 @@
.nav { .nav {
@include sidebar-width($sidebar-borders, $sidebar-width); @include sidebar-width($sidebar-borders, $sidebar-width);
flex-direction: column;
min-height: 100%; min-height: 100%;
flex-direction: column;
} }
.nav-title { .nav-title {
@@ -254,6 +254,7 @@
flex: 0 0 $sidebar-footer-height; flex: 0 0 $sidebar-footer-height;
padding: $sidebar-footer-padding-y $sidebar-footer-padding-x; padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
background: $sidebar-footer-bg; background: $sidebar-footer-bg;
@include borders($sidebar-footer-borders);
} }
.sidebar-minimizer { .sidebar-minimizer {
@@ -261,6 +262,7 @@
flex: 0 0 $sidebar-minimizer-height; flex: 0 0 $sidebar-minimizer-height;
background-color: $sidebar-minimizer-bg; background-color: $sidebar-minimizer-bg;
border: 0; border: 0;
@include borders($sidebar-minimizer-borders);
&::before { &::before {
position: absolute; position: absolute;
Vue_Full_Project/scss/core/_variables.scss
+5 -2
View File
@@ -58,10 +58,11 @@ $navbar-brand-border: (
) )
) !default; ) !default;
$navbar-brand-minimized-width: 50px !default $navbar-brand-minimized-width: 50px !default;
$navbar-brand-minimized-bg: #fff !default; $navbar-brand-minimized-bg: $navbar-brand-bg !default;
$navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default; $navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default;
$navbar-brand-minimized-logo-size: 24px !default; $navbar-brand-minimized-logo-size: 24px !default;
$navbar-brand-minimized-border: $navbar-brand-border !default;
$navbar-color: $gray-600 !default; $navbar-color: $gray-600 !default;
$navbar-hover-color: $gray-800 !default; $navbar-hover-color: $gray-800 !default;
@@ -132,11 +133,13 @@ $sidebar-footer-height: auto !default;
$sidebar-footer-bg: rgba(0,0,0,.2) !default; $sidebar-footer-bg: rgba(0,0,0,.2) !default;
$sidebar-footer-padding-y: .75rem !default; $sidebar-footer-padding-y: .75rem !default;
$sidebar-footer-padding-x: 1rem !default; $sidebar-footer-padding-x: 1rem !default;
$sidebar-footer-borders: 0 !default;
// Sidebar Minimizer // Sidebar Minimizer
$sidebar-minimizer-height: 50px !default; $sidebar-minimizer-height: 50px !default;
$sidebar-minimizer-bg: rgba(0,0,0,.2) !default; $sidebar-minimizer-bg: rgba(0,0,0,.2) !default;
$sidebar-minimizer-borders: 0 !default;
$sidebar-minimizer-indicator-color: $gray-600 !default; $sidebar-minimizer-indicator-color: $gray-600 !default;
$sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default; $sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
$sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default; $sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default;
Vue_Full_Project/scss/style.scss
+2 -8
View File
@@ -1,6 +1,6 @@
/*! /*!
* CoreUI - Open Source Bootstrap Admin Template * CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.0 * @version v1.0.1
* @link http://coreui.io * @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek * Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT * @license MIT
@@ -11,23 +11,17 @@
// Import Bootstrap source files // Import Bootstrap source files
@import "bootstrap/bootstrap"; @import "bootstrap/bootstrap";
// If you want you can import bootstrap scss files directly from node_modules or bower_components. // If you want you can import bootstrap scss files directly from node_modules.
// To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line. // To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line.
// Import Bootstrap source files from node_modules // Import Bootstrap source files from node_modules
// @import "node_modules/bootstrap/scss/bootstrap"; // @import "node_modules/bootstrap/scss/bootstrap";
// Import Bootstrap source files from bower_components
// @import "bower_components/bootstrap/scss/bootstrap";
// Override core variables // Override core variables
@import "core-variables"; @import "core-variables";
// Import core styles // Import core styles
@import "core/core"; @import "core/core";
// Import vendors styles
@import "vendors/vendors";
// Custom styles // Custom styles
@import "custom"; @import "custom";
Vue_Full_Project/scss/vendors/_variables.scss
Vendored
+9
View File
@@ -0,0 +1,9 @@
// @import "node_modules/bootstrap/scss/bootstrap/functions";
@import "../bootstrap/functions";
@import "../bootstrap-variables";
// @import "node_modules/bootstrap/scss/bootstrap/variables";
@import "../bootstrap/variables";
// @import "node_modules/bootstrap/scss/bootstrap/mixins";
@import "../bootstrap/mixins";
@import "../core-variables";
@import "../core/variables";
Vue_Full_Project/scss/vendors/_vendors.scss
Vendored
-1
View File
@@ -1 +0,0 @@
@import "chart.js/chart";
Vue_Full_Project/scss/vendors/chart.js/chart.scss
Vendored
+3
View File
@@ -1,3 +1,6 @@
// Import variables
@import '../variables';
.chart-legend, .chart-legend,
.bar-legend, .bar-legend,
.line-legend, .line-legend,
Vue_Full_Project/src/components/Footer.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template> <template>
<footer class="app-footer"> <footer class="app-footer">
<a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs. <span><a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs.</span>
<span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span> <span class="ml-auto">Powered by <a href="http://coreui.io">CoreUI</a></span>
</footer> </footer>
</template> </template>
<script> <script>
Vue_Starter/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@coreui/vue", "name": "@coreui/vue",
"version": "1.0.0", "version": "1.0.1",
"description": "", "description": "",
"author": "Łukasz Holeczek <lukasz@holeczek.pl>", "author": "Łukasz Holeczek <lukasz@holeczek.pl>",
"private": true, "private": true,
Vue_Starter/scss/core/_dropdown-menu-right.scss
+5 -4
View File
@@ -1,7 +1,8 @@
// Temp fix for reactstrap // Temp fix for reactstrap
.show { .app-header {
> .dropdown-menu-right { .navbar-nav {
right: 0; .dropdown-menu-right {
left: auto; // Reset the default from `.dropdown-menu` right: auto;
}
} }
} }
Vue_Starter/scss/core/_footer.scss
+3 -2
View File
@@ -1,8 +1,9 @@
.app-footer { .app-footer {
min-height: $footer-height; display: flex;
padding: 0 $spacer; padding: 0 $spacer;
line-height: $footer-height;
color: $footer-color; color: $footer-color;
background: $footer-bg; background: $footer-bg;
flex-wrap: wrap;
align-items: center;
@include borders($footer-borders); @include borders($footer-borders);
} }
Vue_Starter/scss/core/_layout.scss
+5 -4
View File
@@ -11,8 +11,8 @@
app-dashboard, app-dashboard,
app-root { app-root {
display: flex; display: flex;
flex-direction: column;
min-height: 100vh; min-height: 100vh;
flex-direction: column;
} }
.app-header { .app-header {
@@ -26,12 +26,12 @@ app-root {
.app-body { .app-body {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-grow: 1;
overflow-x: hidden; overflow-x: hidden;
flex-grow: 1;
.main { .main {
flex: 1;
min-width: 0; min-width: 0;
flex: 1;
} }
.sidebar { .sidebar {
@@ -328,7 +328,8 @@ app-root {
margin-top: $navbar-height; margin-top: $navbar-height;
} }
.sidebar { .sidebar,
.sidebar-fixed .sidebar {
position: fixed; position: fixed;
z-index: $zindex-sticky - 1; z-index: $zindex-sticky - 1;
width: $mobile-sidebar-width; width: $mobile-sidebar-width;
Vue_Starter/scss/core/_navbar.scss
+4 -1
View File
@@ -1,7 +1,7 @@
.app-header.navbar { .app-header.navbar {
position: relative; position: relative;
flex-direction: row;
height: $navbar-height; height: $navbar-height;
flex-direction: row;
padding: 0; padding: 0;
margin: 0; margin: 0;
background-color: $navbar-bg; background-color: $navbar-bg;
@@ -102,6 +102,7 @@
background-color: rgba(0,0,0,.075); background-color: rgba(0,0,0,.075);
} }
@include media-breakpoint-up(lg) {
.brand-minimized { .brand-minimized {
.app-header.navbar { .app-header.navbar {
.navbar-brand { .navbar-brand {
@@ -109,6 +110,8 @@
background-color: $navbar-brand-minimized-bg; background-color: $navbar-brand-minimized-bg;
background-image: $navbar-brand-minimized-logo; background-image: $navbar-brand-minimized-logo;
background-size: $navbar-brand-minimized-logo-size; background-size: $navbar-brand-minimized-logo-size;
@include borders($navbar-brand-minimized-border);
}
} }
} }
} }
Vue_Starter/scss/core/_sidebar.scss
+3 -1
View File
@@ -78,8 +78,8 @@
.nav { .nav {
@include sidebar-width($sidebar-borders, $sidebar-width); @include sidebar-width($sidebar-borders, $sidebar-width);
flex-direction: column;
min-height: 100%; min-height: 100%;
flex-direction: column;
} }
.nav-title { .nav-title {
@@ -254,6 +254,7 @@
flex: 0 0 $sidebar-footer-height; flex: 0 0 $sidebar-footer-height;
padding: $sidebar-footer-padding-y $sidebar-footer-padding-x; padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
background: $sidebar-footer-bg; background: $sidebar-footer-bg;
@include borders($sidebar-footer-borders);
} }
.sidebar-minimizer { .sidebar-minimizer {
@@ -261,6 +262,7 @@
flex: 0 0 $sidebar-minimizer-height; flex: 0 0 $sidebar-minimizer-height;
background-color: $sidebar-minimizer-bg; background-color: $sidebar-minimizer-bg;
border: 0; border: 0;
@include borders($sidebar-minimizer-borders);
&::before { &::before {
position: absolute; position: absolute;
Vue_Starter/scss/core/_variables.scss
+5 -2
View File
@@ -58,10 +58,11 @@ $navbar-brand-border: (
) )
) !default; ) !default;
$navbar-brand-minimized-width: 50px !default $navbar-brand-minimized-width: 50px !default;
$navbar-brand-minimized-bg: #fff !default; $navbar-brand-minimized-bg: $navbar-brand-bg !default;
$navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default; $navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default;
$navbar-brand-minimized-logo-size: 24px !default; $navbar-brand-minimized-logo-size: 24px !default;
$navbar-brand-minimized-border: $navbar-brand-border !default;
$navbar-color: $gray-600 !default; $navbar-color: $gray-600 !default;
$navbar-hover-color: $gray-800 !default; $navbar-hover-color: $gray-800 !default;
@@ -132,11 +133,13 @@ $sidebar-footer-height: auto !default;
$sidebar-footer-bg: rgba(0,0,0,.2) !default; $sidebar-footer-bg: rgba(0,0,0,.2) !default;
$sidebar-footer-padding-y: .75rem !default; $sidebar-footer-padding-y: .75rem !default;
$sidebar-footer-padding-x: 1rem !default; $sidebar-footer-padding-x: 1rem !default;
$sidebar-footer-borders: 0 !default;
// Sidebar Minimizer // Sidebar Minimizer
$sidebar-minimizer-height: 50px !default; $sidebar-minimizer-height: 50px !default;
$sidebar-minimizer-bg: rgba(0,0,0,.2) !default; $sidebar-minimizer-bg: rgba(0,0,0,.2) !default;
$sidebar-minimizer-borders: 0 !default;
$sidebar-minimizer-indicator-color: $gray-600 !default; $sidebar-minimizer-indicator-color: $gray-600 !default;
$sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default; $sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
$sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default; $sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default;
Vue_Starter/scss/style.scss
+2 -8
View File
@@ -1,6 +1,6 @@
/*! /*!
* CoreUI - Open Source Bootstrap Admin Template * CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.0 * @version v1.0.1
* @link http://coreui.io * @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek * Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT * @license MIT
@@ -11,23 +11,17 @@
// Import Bootstrap source files // Import Bootstrap source files
@import "bootstrap/bootstrap"; @import "bootstrap/bootstrap";
// If you want you can import bootstrap scss files directly from node_modules or bower_components. // If you want you can import bootstrap scss files directly from node_modules.
// To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line. // To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line.
// Import Bootstrap source files from node_modules // Import Bootstrap source files from node_modules
// @import "node_modules/bootstrap/scss/bootstrap"; // @import "node_modules/bootstrap/scss/bootstrap";
// Import Bootstrap source files from bower_components
// @import "bower_components/bootstrap/scss/bootstrap";
// Override core variables // Override core variables
@import "core-variables"; @import "core-variables";
// Import core styles // Import core styles
@import "core/core"; @import "core/core";
// Import vendors styles
@import "vendors/vendors";
// Custom styles // Custom styles
@import "custom"; @import "custom";
Vue_Starter/scss/vendors/_variables.scss
Vendored
+9
View File
@@ -0,0 +1,9 @@
// @import "node_modules/bootstrap/scss/bootstrap/functions";
@import "../bootstrap/functions";
@import "../bootstrap-variables";
// @import "node_modules/bootstrap/scss/bootstrap/variables";
@import "../bootstrap/variables";
// @import "node_modules/bootstrap/scss/bootstrap/mixins";
@import "../bootstrap/mixins";
@import "../core-variables";
@import "../core/variables";
Vue_Starter/scss/vendors/_vendors.scss
Vendored
-1
View File
@@ -1 +0,0 @@
@import "chart.js/chart";
Vue_Starter/scss/vendors/chart.js/chart.scss
Vendored
+3
View File
@@ -1,3 +1,6 @@
// Import variables
@import '../variables';
.chart-legend, .chart-legend,
.bar-legend, .bar-legend,
.line-legend, .line-legend,
Vue_Starter/src/components/Footer.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template> <template>
<footer class="app-footer"> <footer class="app-footer">
<a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs. <span><a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs.</span>
<span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span> <span class="ml-auto">Powered by <a href="http://coreui.io">CoreUI</a></span>
</footer> </footer>
</template> </template>
<script> <script>
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@coreui/vue", "name": "@coreui/vue",
"version": "1.0.0", "version": "1.0.1",
"description": "Open Source Vue Admin Template", "description": "Open Source Vue Admin Template",
"main": "", "main": "",
"homepage": "http://coreui.io/vue/", "homepage": "http://coreui.io/vue/",