mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

MDL-55071 theme_boost: fixup bootswatch thirdpartylibs

Browse Source 
Allow longhand colour codes for asthetics..
This commit is contained in:
Dan Poltawski 2016-09-22 13:24:28 +01:00
parent d5d0a8028d
commit 5cb8ca8610
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -68,8 +68,9 @@ theme/boost/amd/src/tab.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/preset-flat.scss
theme/boost/scss/preset-flatly.scss
theme/boost/scss/preset-paper.scss
theme/boost/scss/preset-readable.scss
theme/bootstrapbase/less/bootstrap/
theme/bootstrapbase/javascript/html5shiv.js
theme/bootstrapbase/amd/src/bootstrap.js

4
.stylelintignore
View File

@ -1,6 +1,5 @@
# Generated by "grunt ignorefiles"
theme/bootstrapbase/style/
theme/boost/scss/preset-*
node_modules/
vendor/
auth/cas/CAS/
@ -68,8 +67,9 @@ theme/boost/amd/src/tab.js
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
theme/boost/scss/preset-flat.scss
theme/boost/scss/preset-flatly.scss
theme/boost/scss/preset-paper.scss
theme/boost/scss/preset-readable.scss
theme/bootstrapbase/less/bootstrap/
theme/bootstrapbase/javascript/html5shiv.js
theme/bootstrapbase/amd/src/bootstrap.js

6
Gruntfile.js
View File

@ -225,11 +225,7 @@ module.exports = function(grunt) {
var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
// Generate .stylelintignore.
var stylelintIgnores = [
'# Generated by "grunt ignorefiles"',
'theme/bootstrapbase/style/',
'theme/boost/scss/preset-*'
].concat(thirdPartyPaths);
var stylelintIgnores = ['# Generated by "grunt ignorefiles"', 'theme/bootstrapbase/style/'].concat(thirdPartyPaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
};

7
theme/boost/scss/preset-default.scss
View File

@ -1,3 +1,4 @@
/* stylelint-disable color-hex-length */
/**
* Default preset file.
*
@ -41,16 +42,16 @@ $table-border-color: #f4f4f4 !default;
// Dropdowns
$dropdown-border-color: #e2e2e2 !default;
$dropdown-link-color: rgba(0,0,0,.535) !default;
$dropdown-link-color: rgba(0, 0, 0, .535) !default;
// Navbar
$navbar-light-color: rgba(0,0,0,.535) !default;
$navbar-light-color: rgba(0, 0, 0, .535) !default;
$navbar-light-hover-color: $brand-primary !default;
$navbar-light-active-color: $brand-primary !default;
// Cards
$card-border-radius: 0 !default;
$card-border-color: rgba(238,238,238,1) !default;
$card-border-color: rgba(238, 238, 238, 1) !default;
// Breadcrumbs
$breadcrumb-bg: transparent !default;

9
theme/boost/thirdpartylibs.xml
View File

@ -99,7 +99,7 @@
<licenseversion></licenseversion>
</library>
<library>
<location>scss/preset-flat.scss</location>
<location>scss/preset-flatly.scss</location>
<name>Flatly Bootswatch</name>
<license>(MIT)</license>
<version>3.3.7</version>
@ -112,4 +112,11 @@
<version>3.3.7</version>
<licenseversion></licenseversion>
</library>
<library>
<location>scss/preset-readable.scss</location>
<name>Readable Bootswatch</name>
<license>(MIT)</license>
<version>3.3.7</version>
<licenseversion></licenseversion>
</library>
</libraries>