Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/css coding standards #33

Open
wants to merge 38 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
09ee716
Give credit where credit is due
ashleykolodziej Dec 21, 2016
3149be2
Switch from LESS to Sass
ashleykolodziej Dec 21, 2016
a4e602c
Initial compile with Sass
ashleykolodziej Dec 21, 2016
184b453
Update gitignore
ashleykolodziej Dec 21, 2016
4345e81
mediumTransition include to extend
ashleykolodziej Dec 21, 2016
a87dc32
Slow transition to extend
ashleykolodziej Dec 21, 2016
1b1a610
arrowBgStyles to extends
ashleykolodziej Dec 21, 2016
192746d
arrowStyles to extends
ashleykolodziej Dec 21, 2016
defed42
Animations to extends
ashleykolodziej Dec 21, 2016
81b3cb0
Adds transition mixins
ashleykolodziej Dec 21, 2016
6b3385f
Move mixins, extends, vars to separate partial
ashleykolodziej Dec 21, 2016
11390e9
Simplifying loader selectors
ashleykolodziej Dec 21, 2016
48c4602
Simplifying selectors
ashleykolodziej Dec 21, 2016
3e0b148
Simplifying selectors
ashleykolodziej Dec 21, 2016
6d8369f
Simplifying animation selectors
ashleykolodziej Dec 21, 2016
e1b772f
Adds a more specific BU Slideshow class
ashleykolodziej Dec 21, 2016
2420b72
Move from li selector to bu-slideshow-slide
ashleykolodziej Dec 21, 2016
6c89c2a
Simplifying selectors
ashleykolodziej Dec 21, 2016
39484d4
More selector simplification
ashleykolodziej Dec 21, 2016
cf0b943
spacing
ashleykolodziej Dec 21, 2016
f8cf81f
Simplifying, if Flexi has issues roll back here
ashleykolodziej Dec 23, 2016
be3f8cf
Fixing some issues in Flexi with navigation
ashleykolodziej Dec 23, 2016
42c15d9
Revert "Fixing some issues in Flexi with navigation"
ashleykolodziej Dec 23, 2016
f76cdfd
Fixing issues with flexi
ashleykolodziej Dec 23, 2016
d9ae0fc
Selector cleanup
ashleykolodziej Dec 23, 2016
5637430
Run CSScomb
ashleykolodziej Dec 23, 2016
a196e89
Reducing use/scope of !important flag
ashleykolodziej Dec 23, 2016
85792db
Grouping shared styles in captions
ashleykolodziej Dec 23, 2016
53c4bfd
Remove classes which are never used
ashleykolodziej Dec 23, 2016
9780050
Coding style preference: keep exceptions with rule
ashleykolodziej Dec 23, 2016
e07e922
Reduce specificity - pagination buttons
ashleykolodziej Dec 23, 2016
aa8ad10
Move keyframes animation to mixin
ashleykolodziej Jan 3, 2017
39fd3a1
Reduce specificity on navigation styles
ashleykolodziej Jan 3, 2017
fa420ee
Don’t qualify class rules with tag names
ashleykolodziej Jan 3, 2017
2139115
Tidy CSS / CSScomb
ashleykolodziej Jan 3, 2017
2fa6e9a
Move to Sass syntax
ashleykolodziej Jan 3, 2017
faca4d1
TidyCSS / CSScomb
ashleykolodziej Jan 3, 2017
afcc1a8
Move to Sass syntax
ashleykolodziej Jan 3, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
assets/
node_modules
node_modules
/interface/.DS_Store
/.DS_Store
/.sass-cache
/sftp-config.json
2 changes: 1 addition & 1 deletion class-bu-slide.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function get($args = array()){
$this->image_html = $this->get_image_html();
$this->caption['html'] = $this->get_caption_html();

$html = sprintf('<li id="%s" class="slide %s">', $slide_id, $additional_styles);
$html = sprintf('<li id="%s" class="bu-slideshow-slide slide %s">', $slide_id, $additional_styles);
$html .= sprintf('<div class="bu-slide-container %s">', $caption_class);

$slide_inner = $this->image_html . $this->caption['html'];
Expand Down
56 changes: 27 additions & 29 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,29 @@ module.exports = function( grunt ) {
}
},

less: {
slideshow:{
src: 'interface/css/bu-slideshow.less',
dest: 'interface/css/bu-slideshow.css',
// options:{ compress: true }
}
},

cssmin: {
core: {
expand: true,
cwd: 'interface/css',
src: [ '*.css', '!*.min.css' ],
dest: 'interface/css',
ext: '.min.css'
}
sass: {
dev: {
options: {
style: 'expanded',
loadPath: 'css-dev',
},
files: {
'interface/css/bu-slideshow-admin.css': 'interface/css-dev/bu-slideshow-admin.scss',
'interface/css/bu-slideshow-selector.css': 'interface/css-dev/bu-slideshow-selector.scss',
'interface/css/bu-slideshow.css': 'interface/css-dev/bu-slideshow.scss',
}
},
prod: {
options: {
style: 'compressed',
loadPath: 'css-dev',
},
files: {
'interface/css/bu-slideshow-admin.min.css': 'interface/css-dev/bu-slideshow-admin.scss',
'interface/css/bu-slideshow-selector.min.css': 'interface/css-dev/bu-slideshow-selector.scss',
'interface/css/bu-slideshow.min.css': 'interface/css-dev/bu-slideshow.scss',
}
},
},

phplint: {
Expand All @@ -61,22 +68,13 @@ module.exports = function( grunt ) {
tasks: ['uglify'],
options: { spawn: false, },
},
less: {
sass: {
files: [
'interface/css/bu-slideshow.less',
'interface/css-dev/*.scss',
],
tasks: ['styles'],
options: { spawn: false, },
},
styles: {
files: [
'interface/css/*.css',
'!interface/css/*.min.css',
'!interface/css/bu-slideshow.css'
],
tasks: ['cssmin'],
options: { spawn: false, },
},
phplint : {
files : [ '**/*.php' ],
tasks : [ 'phplint' ],
Expand All @@ -89,10 +87,10 @@ module.exports = function( grunt ) {

// Build task.
grunt.registerTask( 'scripts', [ 'uglify' ] );
grunt.registerTask( 'styles', [ 'less', 'cssmin' ] );
grunt.registerTask( 'styles', [ 'sass' ] );
grunt.registerTask( 'build', [ 'styles', 'scripts', 'phplint' ] );

// Default task.
grunt.registerTask( 'default', [ 'build' ] );
grunt.registerTask( 'default', [ 'watch' ] );

};
134 changes: 134 additions & 0 deletions interface/css-dev/_bu-slideshow-library.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
$semi-opaque-fallback: #464646;
$semi-opaque: rgba(0,0,0,0.75);
$semi-opaque-fallback-fade: #686868;
$semi-opaque-fade: rgba(0,0,0,0.35);
$white-fallback: #ffffff;
$white: rgba(255,255,255,1);
$white-fallback-fade: #cdcdcd;
$white-fade: rgba(255,255,255,0.7);


// animation
// Usage: @include animation(spin .8s linear infinite)
@mixin animation ($animations...) {
-webkit-animation: $animations;
-moz-animation: $animations;
-ms-animation: $animations;
-o-animation: $animations;
animation: $animations;
}
// transition
// Usage: @include transition(all 250ms ease-in-out 0s)
@mixin transition ($transitions...) {
-webkit-transition: $transitions;
-moz-transition: $transitions;
-ms-transition: $transitions;
-o-transition: $transitions;
transition: $transitions;
}
// transition-duration
// Usage: @include transition-duration(0.3s)
@mixin transition-duration ($transitions...) {
-webkit-transition-duration: $transitions;
-moz-transition-duration: $transitions;
-ms-transition-duration: $transitions;
-o-transition-duration: $transitions;
transition-duration: $transitions;
}

// keyframes
// Usage: @include keyframes(animation-name) {
// your animation rules here
// }
@mixin keyframes($animation-name) {
@-webkit-keyframes #{$animation-name} {
@content;
}
@-moz-keyframes #{$animation-name} {
@content;
}
@-ms-keyframes #{$animation-name} {
@content;
}
@-o-keyframes #{$animation-name} {
@content;
}
@keyframes #{$animation-name} {
@content;
}
}

%mediumTransition {
@include transition-duration(0.3s);
}
%slowTransition {
@include transition-duration(0.6s);
}
%arrowBgStyles {
background-color:transparent;
cursor:pointer;
display:block;
height: 4em;
line-height:normal;
min-width:2.2em;
position: absolute;
top:50%;
width: 5%;
z-index:1000;
@extend %slowTransition;

&:hover,
&:active {
@extend %slowTransition;

background-color:$semi-opaque-fallback;
background-color:$semi-opaque;
-moz-transition-property:background-color;
-webkit-transition-property:background-color;
transition-property:background-color;
}
}

%arrowStyles {
border-style: solid;
border-width: 0.75em;
border-top-color:transparent;
border-bottom-color:transparent;
content: "";
height: 0;
position: absolute;
top: 1.4em;
width: 0;
}

%animate-slide-default {
left:100%;
position:absolute;
@include transition-duration(1s);
}

%animate-slide-in {
left:0;
@include transition-duration(1s);
}

%animate-slide-out {
left:-100%;
@include transition-duration(1s);
}

%animate-fade-default {
opacity:0;
position:absolute;
@include transition-duration(1.5s);
}

%animate-fade-in {
opacity:1.0;
@include transition-duration(1.5s);
}

%animate-fade-out {
opacity:0;
@include transition-duration(1.5s);
}
Loading