From bc968736df1db4889977a6694bd063cf31c2de52 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 11 Jan 2018 18:30:57 +0900 Subject: [PATCH 1/3] add colors for SolarizedDark --- browser/main/modals/CreateFolderModal.styl | 26 ++++++++++++++++++++++ browser/styles/index.styl | 10 ++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/browser/main/modals/CreateFolderModal.styl b/browser/main/modals/CreateFolderModal.styl index 97fddec7d..bb6528044 100644 --- a/browser/main/modals/CreateFolderModal.styl +++ b/browser/main/modals/CreateFolderModal.styl @@ -76,3 +76,29 @@ body[data-theme="dark"] .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 #C9C9C9 // TODO: use variable. + color white + + .description + color $ui-inactive-text-color + + .control-confirmButton + colorDarkPrimaryButton() diff --git a/browser/styles/index.styl b/browser/styles/index.styl index a7d31f8c7..52acdae7e 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -339,4 +339,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%) \ No newline at end of file +$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 \ No newline at end of file From 1480986a3a4848d20a1abc23bb99523b60499936 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 11 Jan 2018 18:34:00 +0900 Subject: [PATCH 2/3] change submit button style --- browser/main/modals/CreateFolderModal.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/modals/CreateFolderModal.styl b/browser/main/modals/CreateFolderModal.styl index bb6528044..9ded8f4ab 100644 --- a/browser/main/modals/CreateFolderModal.styl +++ b/browser/main/modals/CreateFolderModal.styl @@ -101,4 +101,4 @@ body[data-theme="solarized-dark"] color $ui-inactive-text-color .control-confirmButton - colorDarkPrimaryButton() + colorSolarizedDarkPrimaryButton() From 7771875d576ece64976e3b2a09bdd398edc7ea7f Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 13 Jan 2018 11:37:47 +0900 Subject: [PATCH 3/3] Change CreateFolderInput style from raw color code to variable --- browser/main/modals/CreateFolderModal.styl | 6 +++--- browser/styles/index.styl | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/main/modals/CreateFolderModal.styl b/browser/main/modals/CreateFolderModal.styl index 9ded8f4ab..45f2e852c 100644 --- a/browser/main/modals/CreateFolderModal.styl +++ b/browser/main/modals/CreateFolderModal.styl @@ -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 @@ -68,7 +68,7 @@ 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 @@ -94,7 +94,7 @@ body[data-theme="solarized-dark"] color $ui-solarized-dark-text-color .control-folder-input - border 1px solid #C9C9C9 // TODO: use variable. + border 1px solid $ui-input--create-folder-modal color white .description diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 52acdae7e..e8a70e1f4 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -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