diff --git a/public/css/skins/skin-black-dark.css b/public/css/skins/skin-black-dark.css index 9a75db3195..d06fe7d940 100644 Binary files a/public/css/skins/skin-black-dark.css and b/public/css/skins/skin-black-dark.css differ diff --git a/public/css/skins/skin-black-dark.css.map b/public/css/skins/skin-black-dark.css.map index a847215c35..5eaceb4530 100644 Binary files a/public/css/skins/skin-black-dark.css.map and b/public/css/skins/skin-black-dark.css.map differ diff --git a/public/css/skins/skin-blue-dark.css b/public/css/skins/skin-blue-dark.css index 4353fd69c6..207efdc9c6 100644 Binary files a/public/css/skins/skin-blue-dark.css and b/public/css/skins/skin-blue-dark.css differ diff --git a/public/css/skins/skin-blue-dark.css.map b/public/css/skins/skin-blue-dark.css.map index e1ec1d7176..428ba3efa4 100644 Binary files a/public/css/skins/skin-blue-dark.css.map and b/public/css/skins/skin-blue-dark.css.map differ diff --git a/public/css/skins/skin-green-dark.css b/public/css/skins/skin-green-dark.css index 3989a6c155..167ac16b07 100644 Binary files a/public/css/skins/skin-green-dark.css and b/public/css/skins/skin-green-dark.css differ diff --git a/public/css/skins/skin-green-dark.css.map b/public/css/skins/skin-green-dark.css.map index 0cacb6767b..a1704d541b 100644 Binary files a/public/css/skins/skin-green-dark.css.map and b/public/css/skins/skin-green-dark.css.map differ diff --git a/public/css/skins/skin-orange-dark.css b/public/css/skins/skin-orange-dark.css index 8a9822523e..525986fd94 100644 Binary files a/public/css/skins/skin-orange-dark.css and b/public/css/skins/skin-orange-dark.css differ diff --git a/public/css/skins/skin-orange-dark.css.map b/public/css/skins/skin-orange-dark.css.map index 8350b4b882..85e83908d1 100644 Binary files a/public/css/skins/skin-orange-dark.css.map and b/public/css/skins/skin-orange-dark.css.map differ diff --git a/public/css/skins/skin-purple-dark.css b/public/css/skins/skin-purple-dark.css index 7582e007a1..3c1df2f406 100644 Binary files a/public/css/skins/skin-purple-dark.css and b/public/css/skins/skin-purple-dark.css differ diff --git a/public/css/skins/skin-purple-dark.css.map b/public/css/skins/skin-purple-dark.css.map index 784ff90044..4622180286 100644 Binary files a/public/css/skins/skin-purple-dark.css.map and b/public/css/skins/skin-purple-dark.css.map differ diff --git a/public/css/skins/skin-red-dark.css b/public/css/skins/skin-red-dark.css index 316773f99c..97b0e56e62 100644 Binary files a/public/css/skins/skin-red-dark.css and b/public/css/skins/skin-red-dark.css differ diff --git a/public/css/skins/skin-red-dark.css.map b/public/css/skins/skin-red-dark.css.map index e5c17320f2..b9f5052d86 100644 Binary files a/public/css/skins/skin-red-dark.css.map and b/public/css/skins/skin-red-dark.css.map differ diff --git a/public/css/skins/skin-yellow-dark.css b/public/css/skins/skin-yellow-dark.css index e0f91b7cec..2e3474c67e 100644 Binary files a/public/css/skins/skin-yellow-dark.css and b/public/css/skins/skin-yellow-dark.css differ diff --git a/public/css/skins/skin-yellow-dark.css.map b/public/css/skins/skin-yellow-dark.css.map index dbbf63a058..0a7f90bf6e 100644 Binary files a/public/css/skins/skin-yellow-dark.css.map and b/public/css/skins/skin-yellow-dark.css.map differ diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map index 5c755baf1b..ea58fb2df0 100644 Binary files a/public/js/build/vue.js.map and b/public/js/build/vue.js.map differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 573140d1fb..78bba9a530 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -7,18 +7,18 @@ "/css/skins/skin-red.css": "/css/skins/skin-red.css?id=3161759c00be8a16387e", "/css/skins/skin-contrast.css": "/css/skins/skin-contrast.css?id=732ee1ee283c8275b0c3", "/css/skins/skin-green.css": "/css/skins/skin-green.css?id=191049461e7b9606e5ca", - "/css/skins/skin-green-dark.css": "/css/skins/skin-green-dark.css?id=d3671dfad0189f916d2d", + "/css/skins/skin-green-dark.css": "/css/skins/skin-green-dark.css?id=afcc1b413bba696f1237", "/css/skins/skin-black.css": "/css/skins/skin-black.css?id=1dfec89b8640b69dc0fc", - "/css/skins/skin-black-dark.css": "/css/skins/skin-black-dark.css?id=9ae528cc5f9c40b930f8", - "/css/skins/skin-red-dark.css": "/css/skins/skin-red-dark.css?id=bf5a998b4ed21331dd9d", + "/css/skins/skin-black-dark.css": "/css/skins/skin-black-dark.css?id=d3e17a59a4261e7af22a", + "/css/skins/skin-red-dark.css": "/css/skins/skin-red-dark.css?id=aff0dcabe1295cd520ef", "/css/skins/skin-purple.css": "/css/skins/skin-purple.css?id=a3d679dc5d219e2311c9", - "/css/skins/skin-purple-dark.css": "/css/skins/skin-purple-dark.css?id=27e40ba1d9580c5dbdc0", + "/css/skins/skin-purple-dark.css": "/css/skins/skin-purple-dark.css?id=39a8a2495bb64ae056ff", "/css/skins/skin-yellow.css": "/css/skins/skin-yellow.css?id=326096b7e7c0af8a4adf", - "/css/skins/skin-yellow-dark.css": "/css/skins/skin-yellow-dark.css?id=5ecc180209e6a39a9f16", - "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=c4ccadcd9f771d36c6e4", - "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=94634f8d6b75bffa1700", + "/css/skins/skin-yellow-dark.css": "/css/skins/skin-yellow-dark.css?id=a4d510ebabd6d182d728", + "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=4c0480eb584a7d358024", + "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=e5177317fb1f1baa1a46", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=d5d91824310f39239fc2", - "/js/build/vue.js.map": "/js/build/vue.js.map?id=3df18469621e8e2ddfca", + "/js/build/vue.js.map": "/js/build/vue.js.map?id=2d3913576a1a114ba151", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/overrides.css.map": "/css/overrides.css.map?id=750ac6db3f6c3533777a", @@ -26,16 +26,16 @@ "/css/skins/skin-red.css.map": "/css/skins/skin-red.css.map?id=d9e30ec9a781e3d1175e", "/css/skins/skin-contrast.css.map": "/css/skins/skin-contrast.css.map?id=5dbf3db4b4665efd1246", "/css/skins/skin-green.css.map": "/css/skins/skin-green.css.map?id=4b6523370cb6abc02826", - "/css/skins/skin-green-dark.css.map": "/css/skins/skin-green-dark.css.map?id=4839070a036b1fad832f", + "/css/skins/skin-green-dark.css.map": "/css/skins/skin-green-dark.css.map?id=fae3a02b49b2f545b7b3", "/css/skins/skin-black.css.map": "/css/skins/skin-black.css.map?id=ad0bf20283280a01b34f", - "/css/skins/skin-black-dark.css.map": "/css/skins/skin-black-dark.css.map?id=a568d50553ba65ee7770", - "/css/skins/skin-red-dark.css.map": "/css/skins/skin-red-dark.css.map?id=6028ac1403015f935749", + "/css/skins/skin-black-dark.css.map": "/css/skins/skin-black-dark.css.map?id=842817a4469098c57090", + "/css/skins/skin-red-dark.css.map": "/css/skins/skin-red-dark.css.map?id=f379cd11992fddecbe03", "/css/skins/skin-purple.css.map": "/css/skins/skin-purple.css.map?id=1904684da5f92dbc14de", - "/css/skins/skin-purple-dark.css.map": "/css/skins/skin-purple-dark.css.map?id=1b1bae7a24a6594b247b", + "/css/skins/skin-purple-dark.css.map": "/css/skins/skin-purple-dark.css.map?id=05a3efe13f8de7273a2c", "/css/skins/skin-yellow.css.map": "/css/skins/skin-yellow.css.map?id=f4652aa1bd9463b2c210", - "/css/skins/skin-yellow-dark.css.map": "/css/skins/skin-yellow-dark.css.map?id=8c4bef295ca4c00eaf68", - "/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=61890aad394ba8628d7d", - "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=81c95fc45ee39bb4a846", + "/css/skins/skin-yellow-dark.css.map": "/css/skins/skin-yellow-dark.css.map?id=86dbeaea1092787eed79", + "/css/skins/skin-blue-dark.css.map": "/css/skins/skin-blue-dark.css.map?id=aaa8570a4592e62abbaf", + "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=37c54504668ee3ef58d8", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=5cb51f4917038fd753ce", "/css/dist/all.css": "/css/dist/all.css?id=9c6b075989db098ee828", "/js/dist/all.js": "/js/dist/all.js?id=67e4a9bf8c403850a6ec", diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index 64cb0177fc..736150cca9 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@black, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@black, 10%); @@ -87,17 +89,16 @@ a { - color: @black; &:hover { - color: darken(@black, 20%); + color: #fff; } &:visited { - color: @black; + color: #fff; } } .text-primary { - color: darken(@black, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @black; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@black, 10%); /* Use same as Header picker */ + --link: lighten(@black, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@black, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index 3b3377a861..a0d07fa7b0 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -11,11 +11,11 @@ //Navbar .main-header { .navbar { - .navbar-variant(@blue; #fff); + .navbar-variant(@navy; #fff); .sidebar-toggle { color: #fff; &:hover { - background-color: darken(@blue, 5%); + background-color: darken(@navy, 5%); } } @media (max-width: @screen-header-collapse) { @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { - background: darken(@blue, 5%); + background: darken(@navy, 5%); + color: #fff; } } } @@ -37,7 +39,7 @@ //Logo li.user-header { - background-color: @blue; + background-color: @navy; } } @@ -47,7 +49,7 @@ } //Create the sidebar skin - .skin-dark-sidebar(@blue); + .skin-dark-sidebar(@navy); } .skin-blue-dark.layout-top-nav .main-header > .logo { @@ -59,45 +61,44 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { - background-color: darken(@blue, 10%); - border-color: darken(@blue, 20%); + background-color: darken(@navy, 10%); + border-color: darken(@navy, 20%); color: #fff; } &a.btn-primary:hover { - background-color: darken(@blue, 20%); - border-color: darken(@blue, 20%); + background-color: darken(@navy, 20%); + border-color: darken(@navy, 20%); color: #fff; } &.btn-white:link { - background-color: darken(@blue, 10%); + background-color: darken(@navy, 10%); color: #fff; } &.btn-white:hover { - background-color: darken(@blue, 30%); + background-color: darken(@navy, 30%); color: #fff; } } a { - color: @blue; &:hover { - color: darken(@blue, 20%); + color: #fff; } &:visited { - color: @blue; + color: #fff; } } .text-primary { - color: darken(@blue, 20%); + color: #fff; } @@ -107,12 +108,12 @@ a { --background: #222; --back-main: #333; --back-sub: #444; - --header: @blue; /* Use same as Header picker */ + --header: @navy; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@blue, 10%); /* Use same as Header picker */ + --link: lighten(@navy, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@blue, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 036bfeff78..9b08da4827 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@green, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@green, 10%); @@ -87,17 +89,16 @@ a { - color: @green; &:hover { - color: darken(@green, 20%); + color: #fff; } &:visited { - color: @green; + color: #fff; } } .text-primary { - color: darken(@green, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @green; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@green, 10%); /* Use same as Header picker */ + --link: lighten(@green, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@green, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 50d0a4257e..b157f3c147 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@orange, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@orange, 10%); @@ -87,17 +89,16 @@ a { - color: @orange; &:hover { - color: darken(@orange, 20%); + color: #fff; } &:visited { - color: @orange; + color: #fff; } } .text-primary { - color: darken(@orange, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @orange; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@orange, 10%); /* Use same as Header picker */ + --link: lighten(@orange, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@orange, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 1f2f5f1ee3..658b7bae6c 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -1,5 +1,5 @@ /* - * Skin: Purple + * Skin: purple * ---------- */ @import "../bootstrap-less/mixins.less"; @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@purple, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@purple, 10%); @@ -87,17 +89,16 @@ a { - color: @purple; &:hover { - color: darken(@purple, 20%); + color: #fff; } &:visited { - color: @purple; + color: #fff; } } .text-primary { - color: darken(@purple, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @purple; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@purple, 10%); /* Use same as Header picker */ + --link: lighten(@purple, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@purple, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -276,10 +277,10 @@ input[type=text], input[type=search] { background-color: var(--back-main); color: var(--text-main); } -.skin-purple-dark .main-header .navbar .dropdown-menu li a { +.skin-blue-dark .main-header .navbar .dropdown-menu li a { color: var(--header); } -.skin-purple-dark .sidebar-menu>li.active>a, .skin-purple .sidebar-menu>li:hover>a, .sidebar-toggle:hover { +.skin-blue-dark .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a, .sidebar-toggle:hover { background-color: var(--header)!important; } .tab-content, .tab-pane { @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 39b5834b37..98dbfbe12e 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@red, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@red, 10%); @@ -87,17 +89,16 @@ a { - color: @red; &:hover { - color: darken(@red, 20%); + color: #fff; } &:visited { - color: @red; + color: #fff; } } .text-primary { - color: darken(@red, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @red; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@red, 10%); /* Use same as Header picker */ + --link: lighten(@red, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@red, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -276,10 +277,10 @@ input[type=text], input[type=search] { background-color: var(--back-main); color: var(--text-main); } -.skin-red-dark .main-header .navbar .dropdown-menu li a { +.skin-blue-dark .main-header .navbar .dropdown-menu li a { color: var(--header); } -.skin-red-dark .sidebar-menu>li.active>a, .skin-red .sidebar-menu>li:hover>a, .sidebar-toggle:hover { +.skin-blue-dark .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a, .sidebar-toggle:hover { background-color: var(--header)!important; } .tab-content, .tab-pane { @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index 63c4672380..fe1b5c1d8c 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -1,5 +1,5 @@ /* - * Skin: yellow + * Skin: orange * ---------- */ @import "../bootstrap-less/mixins.less"; @@ -23,11 +23,13 @@ li { &.divider { background-color: rgba(255, 255, 255, 0.1); + color: #fff; } a { color: #fff; &:hover { background: darken(@yellow, 5%); + color: #fff; } } } @@ -59,7 +61,7 @@ .btn, .btn:hover { - + color: #fff; &.btn-primary, .btn-primary:link { background-color: darken(@yellow, 10%); @@ -87,17 +89,16 @@ a { - color: @yellow; &:hover { - color: darken(@yellow, 20%); + color: #fff; } &:visited { - color: @yellow; + color: #fff; } } .text-primary { - color: darken(@yellow, 20%); + color: #fff; } @@ -110,9 +111,9 @@ a { --header: @yellow; /* Use same as Header picker */ --text-main: #FFF; --text-sub: #BBB; - --link: lighten(@yellow, 10%); /* Use same as Header picker */ + --link: lighten(@yellow, 50%); /* Use same as Header picker */ --nav-link: #FFF; /* Use same as Header picker */ - --light-link: lighten(@yellow, 30%); /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ } .main-header .navbar, .main-header .logo { @@ -194,7 +195,7 @@ body { } .dropdown-menu, .dropdown-menu>li>a { background-color: var(--back-sub); - color: var(--header); + color: var(--text-main); } .dropdown-menu>li>a:hover { background-color: var(--back-main); @@ -304,4 +305,32 @@ a { &:visited { color: var(--link); } -} \ No newline at end of file +} + +.row-striped { + vertical-align: top; + line-height: 2.6; + padding: 0px; + margin-left: 20px; + box-sizing: border-box; + //border-left: 1px solid #dddddd; + //border-right: 1px solid #dddddd; + display: table; + +} + +.row-striped .row:nth-of-type(odd) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; + +} + +.row-striped .row:nth-of-type(even) div { + background-color: var(--back-sub); + color: var(--text-main); + border-top: 1px solid #dddddd; + display: table-cell; +} + diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 8c7059f021..39be2729eb 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -96,7 +96,7 @@
@can('checkout', \App\Models\Accessory::class) - numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} + numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} @endcan