Skip to content

fix bug happen on solarized-dark CreateFolderModal. #1384

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

Merged
Rokt33r merged 3 commits into from
Jan 13, 2018
Merged

fix bug happen on solarized-dark CreateFolderModal. #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc96873
add colors for SolarizedDark
sosukesuzuki Jan 11, 2018
1480986
change submit button style
sosukesuzuki Jan 11, 2018
7771875
Change CreateFolderInput style from raw color code to variable
sosukesuzuki Jan 13, 2018
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
30 changes: 28 additions & 2 deletions browser/main/modals/CreateFolderModal.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
width 490px
padding 0 5px
margin 10px 0
border 1px solid #C9C9C9 // TODO: use variable.
border 1px solid $ui-input--create-folder-modal
border-radius 2px
background-color transparent
outline none
Expand Down Expand Up @@ -68,11 +68,37 @@ body[data-theme="dark"]
color $ui-dark-text-color

.control-folder-input
border 1px solid #C9C9C9 // TODO: use variable.
border 1px solid $ui-input--create-folder-modal
color white

.description
color $ui-inactive-text-color

.control-confirmButton
colorDarkPrimaryButton()

body[data-theme="solarized-dark"]
.root
modalSolarizedDark()
width 500px
height 270px
overflow hidden
position relative

.header
background-color transparent
border-color $ui-dark-borderColor
color $ui-solarized-dark-text-color

.control-folder-label
color $ui-solarized-dark-text-color

.control-folder-input
border 1px solid $ui-input--create-folder-modal
color white

.description
color $ui-inactive-text-color

.control-confirmButton
colorSolarizedDarkPrimaryButton()
11 changes: 10 additions & 1 deletion browser/styles/index.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ tooltip()
// UI Input
$ui-input--focus-borderColor = #369DCD
$ui-input--disabled-backgroundColor = #DDD
$ui-input--create-folder-modal = #C9C9C9

// Parts
$ui-favorite-star-button-color = #FFC216
Expand Down Expand Up @@ -339,4 +340,12 @@ $ui-solarized-dark-button-backgroundColor = #002b36
$ui-solarized-dark-button--active-color = #93a1a1
$ui-solarized-dark-button--active-backgroundColor = #073642
$ui-solarized-dark-button--hover-backgroundColor = lighten($ui-dark-backgroundColor, 10%)
$ui-solarized-dark-button--focus-borderColor = lighten(#369DCD, 25%)
$ui-solarized-dark-button--focus-borderColor = lighten(#369DCD, 25%)

modalSolarizedDark()
position relative
z-index $modal-z-index
width 100%
background-color $ui-solarized-dark-backgroundColor
overflow hidden
border-radius $modal-border-radius