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

Fix: Button scoping issues #160

Merged
merged 2 commits into from
Jan 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
"build": "yarn run pre-build && LANGUAGE=en-US BABEL_ENV=dev NODE_ENV=dev ./node_modules/.bin/webpack --progress --colors --config build/webpack.config.js",
"build-ci": "LANGUAGE=en-US yarn run build-prod",
"build-prod": "BABEL_ENV=production NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --config build/webpack.config.js",
"build-npm": "yarn run npm && yarn run copy-lib && BABEL_ENV=npm NODE_ENV=production ./node_modules/.bin/babel lib -d lib",
"build-npm": "yarn run npm && yarn run build-lib",
"build-npm-source-map": "yarn run npm && yarn run copy-lib && BABEL_ENV=npm NODE_ENV=production ./node_modules/.bin/babel lib -d lib -s inline",
"build-lib": "yarn run copy-lib && BABEL_ENV=npm NODE_ENV=production ./node_modules/.bin/babel lib -d lib",
"build-locales": "node ./build/props-to-es2015.js",
"changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -r 0",
"clean": "rm -rf dist lib reports/* i18n/json i18n/*.js",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/Breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
min-width: 64px;
}

.btn-plain {
.be & .btn-plain {
color: $sevens;

&:last-child {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/BreadcrumbDropdown.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../variables';

.btn-plain.be-breadcrumbs-drop-down {
.be .btn-plain.be-breadcrumbs-drop-down {
color: $sevens;
letter-spacing: 1.5px;

Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumbs/InlineBreadcrumbs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
min-width: 43px;
}

.btn-plain {
.be & .btn-plain {
color: inherit;
font-size: 11px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ContentExplorer/ItemList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}

.bce-item-coloumn,
.btn-plain {
.be & .btn-plain {
color: $dark-cerulean;
}
}
Expand All @@ -56,7 +56,7 @@
}

.bce-item-coloumn,
.btn-plain {
.be & .btn-plain {
color: $dark-cerulean;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ContentPicker/ItemList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
background-color: $light-blue;
border-top-color: $grey-blue;

.btn-plain,
.be & .btn-plain,
.be-item-label {
color: $dark-cerulean;
}
Expand Down Expand Up @@ -82,7 +82,7 @@
}
}

.btn-plain,
.be & .btn-plain,
.be-item-label {
color: $dark-cerulean;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContentPreview/Header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.bcpr-btns {
display: flex;

.btn-plain.bcpr-btn {
.be & .btn-plain.bcpr-btn {
padding: 0 15px 0 5px;

&:hover,
Expand Down
4 changes: 1 addition & 3 deletions src/components/ContentSidebar/ContentSidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@
}

.bcs-loading {
align-items: center;
display: flex;
height: 100%;
flex: 1;
}
2 changes: 1 addition & 1 deletion src/components/ContentSidebar/Sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
display: flex;
flex-direction: column;

.btn-plain {
.be & .btn-plain {
border-left: 2px solid transparent;
border-radius: 0;
height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContentSidebar/SidebarSection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
padding: 15px 0 5px;
}

.btn-plain.bcs-section-title {
.be .btn-plain.bcs-section-title {
border-bottom: 1px solid $off-white;
padding: 5px 0 10px;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Keywords/Keyword.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
display: inline-block;
margin: 0 3px 8px;

.btn-plain {
.be & .btn-plain {
border: 1px solid $see-see;
color: $sevens;
padding: 5px 10px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Timeline/Line.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../variables';

.btn-plain.be-timeline-time {
.be .btn-plain.be-timeline-time {
border-radius: 6px;
cursor: pointer;
height: 6px;
Expand Down
2 changes: 1 addition & 1 deletion test/preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
window.onload = function() {
const { ContentExplorer } = Box;
const explorer = new ContentExplorer();
explorer.show('0', 'yBhjw4REZTCCHVnEe2GRv7zFZepBR7WN', {
explorer.show('0', 'pSS313sgzGYYSCwVuVKek7YCjFT2h6oY', {
currentFolderId: '39695871110',
hasPreviewSidebar: true,
sharedLink: 'https://app.box.com/s/sdfsdf'
Expand Down