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.

Sign up for GitHub

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

Masterbar: clean up, component refactor, and move to gridicons #631

Merged
merged 18 commits into from
Dec 21, 2015
Merged

Masterbar: clean up, component refactor, and move to gridicons #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5ab5e68
Masterbar: convert main jsx to ES6 syntax.
mtias Nov 24, 2015
308c193
Masterbar: remove arbitrary classes, add prefixes, clean up code.
mtias Nov 24, 2015
adc59d8
Masterbar: convert masterbar-sections-menu to ES6.
mtias Nov 24, 2015
9b72473
Rework masterbar component classes, reduce code complexity.
mtias Nov 24, 2015
bb6abb4
Replace noticons with <Gridicon> in masterbar.
mtias Nov 24, 2015
4f4c649
Masterbar: update logged-out classes and use WP gridicon
seear Dec 7, 2015
f57db1c
Masterbar: heavy refactoring, part 1.
folletto Dec 8, 2015
0f4e63b
Added propTypes to masterbar.
folletto Dec 11, 2015
6b758e5
Masterbar: refactor part 2.
folletto Dec 11, 2015
710a3b5
Masterbar: React 0.14 compat.
ehg Dec 14, 2015
937afe2
ES6ify components.
ehg Dec 14, 2015
355cd94
Masterbar: various fixes and cleanup.
folletto Dec 15, 2015
564a932
Cleanup: renamed variables, single classes call
folletto Dec 15, 2015
aad188e
Layout: less files.
ehg Dec 15, 2015
9f88b6c
Cleanup: warnings removed (PropTypes)
folletto Dec 15, 2015
854c67d
Fix: removed padding: made the buttons not center aligned
folletto Dec 16, 2015
b1c1233
Masterbar: setup component organisation and style file.
mtias Dec 17, 2015
d84201f
Fix: tooltips added back + moved top level
folletto Dec 18, 2015
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
2 changes: 1 addition & 1 deletion assets/stylesheets/_components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
@import 'components/vertical-nav/style';
@import 'components/vertical-nav/item/style';
@import 'layout/community-translator/style';
@import 'layout/masterbar-new-post';
@import 'layout/masterbar/style';
@import 'lib/accept/style';
@import 'me/account-password/style';
@import 'me/account/style';
Expand Down
9 changes: 6 additions & 3 deletions assets/stylesheets/layout/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
}

.layout__loader {
background: $blue-wordpress;
border-bottom: 1px solid darken( $blue-wordpress, 4% );
height: 46px;
margin-left: -30px;
margin-left: -10%;
position: absolute;
left: 50%;
top: 0;
width: 60px;
width: 20%;
z-index: z-index( 'root', '.layout__loader' );

// set a delay threshold for opacity changes
Expand All @@ -32,6 +31,10 @@
opacity: 0;
transition: opacity 0.1s linear;
transition-delay: 0.4s;

@include breakpoint( "<480px" ) {
background: $blue-wordpress;
}
}

.layout__loader.is-active {
Expand Down
335 changes: 0 additions & 335 deletions assets/stylesheets/layout/_masterbar.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion assets/stylesheets/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

// Layouts
@import 'layout/main'; // global layout and responsive styles
@import 'layout/masterbar'; // masterbar styles
@import 'layout/sidebar'; // sidebar styles, shared across most pages
@import 'layout/overlay'; // overlay UX styling
@import 'layout/detail-page'; // detail page styles
Expand Down
2 changes: 1 addition & 1 deletion client/layout/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var React = require( 'react' ),
/**
* Internal dependencies
*/
var Masterbar = require( './masterbar' ),
var Masterbar = require( 'layout/masterbar' ),
observe = require( 'lib/mixins/data-observe' ),
NoticesList = require( 'notices/notices-list' ),
notices = require( 'notices' ),
Expand Down
2 changes: 1 addition & 1 deletion client/layout/logged-out.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var React = require( 'react' ),
/**
* Internal dependencies
*/
var Masterbar = require( './masterbar' ),
var Masterbar = require( 'layout/masterbar' ),
NoticesList = require( 'notices/notices-list' ),
notices = require( 'notices' );

Expand Down
Loading