Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Button tweak prefs font nicer #6000

Merged
merged 6 commits into from
Dec 6, 2016
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
4 changes: 2 additions & 2 deletions app/renderer/components/addEditBookmarkHanger.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ class AddEditBookmarkHanger extends ImmutableComponent {
<div className='bookmarkButtons'>
{
this.props.originalDetail
? <Button l10nId='remove' className='removeButton whiteButton' onClick={this.onRemoveBookmark} />
? <Button l10nId='remove' className='whiteButton wideButton' onClick={this.onRemoveBookmark} />
: null
}
<Button l10nId='done' disabled={!this.bookmarkNameValid} className='doneButton primaryButton' onClick={this.onSave} />
<Button l10nId='done' disabled={!this.bookmarkNameValid} className='primaryButton wideButton' onClick={this.onSave} />
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion less/about/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

* {
color: @textColor;
font-family: "Arial";
font-family: "Helvetica Neue", Arial, sans-serif;
font-weight: 400;
margin: 0;
padding: 0;
}
Expand Down
9 changes: 6 additions & 3 deletions less/about/newtab.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@


strong, div, span, li, em, p, a {
font-weight: 200;
font-family: "Helvetica Neue", Arial, sans-serif;
font-weight: 400;
-webkit-font-smoothing: antialiased;
}

Expand Down Expand Up @@ -138,7 +139,7 @@ ul {

.time {
font-size: 75px;
font-weight: 400;
font-weight: 200;
color: #fff;
}

Expand Down Expand Up @@ -358,6 +359,7 @@ ul {
.copyrightCredits {
&, .photoBy, .copyrightOwner {
color: #fff;
font-size: 15px;
text-transform: uppercase;
}

Expand All @@ -375,7 +377,8 @@ ul {
}

.photoName {
color: @white50;
color: @white75;
font-size: 23px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion less/about/preferences.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "./common.less";

strong, div, span, li, em, p, a {
font-weight: 200;
font-weight: 400;
-webkit-font-smoothing: antialiased;
}

Expand Down
2 changes: 1 addition & 1 deletion less/about/siteDetails.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import "./common.less";

strong, div, span, li, em, p, a {
font-weight: 200;
font-weight: 400;
-webkit-font-smoothing: antialiased;
}

Expand Down
6 changes: 3 additions & 3 deletions less/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ span.buttonSeparator {
line-height: 25px;
width: 25px;
height: 25px;
font-size: 14px;
font-size: 13px;
color: @buttonColor;
border-radius: @borderRadius;
margin: 0 3px;
Expand Down Expand Up @@ -98,7 +98,7 @@ span.buttonSeparator {
border-top: 1px solid @braveLightOrange;
border-bottom: 1px solid @braveOrange;
box-shadow: @buttonShadow;
font-weight: 400;
font-weight: 500;

&:hover {
border: 1px solid white;
Expand Down Expand Up @@ -144,7 +144,7 @@ span.buttonSeparator {
.settingsList > .settingItem + button,
.settingItem > span + button,
#paymentsContainer button:not(.close) {
font-size: 0.9em;
font-size: 13px;
padding: 8px 20px;
}

Expand Down
11 changes: 6 additions & 5 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@
background: linear-gradient(#FFFFFF, #DEDEDE);
margin-top: 10px;
padding: 0;
min-width: 310px;

.arrowUp {
width: 0;
Expand All @@ -572,18 +573,18 @@
}

.bookmarkButtons {
margin: 20px 0 10px 0;

.doneButton {
margin-right: 0;
}
display: flex;
justify-content: flex-end;
margin: 20px 0 10px;
}

.bookmarkFormInner {
padding: 10px 30px;

h2 {
-webkit-user-select: none;
cursor: default;
min-width: 250px;
}
}

Expand Down
8 changes: 0 additions & 8 deletions less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -591,14 +591,6 @@
}

#navigator {
.bookmarkButtons {
display: flex;

.removeButton {
flex-grow: 1;
}
}

.stopButton,
.reloadButton,
.homeButton {
Expand Down
2 changes: 1 addition & 1 deletion less/switchControls.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

&:not(.disabled) {
.switchBackground.switchedOn {
background-color: @braveOrange;
background-color: @switchBG_on;
.switchIndicator {
right: 2px;
}
Expand Down
7 changes: 4 additions & 3 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
@braveDarkOrange: #D44600;
@dragSpacing: 50px;

@switchBG_on: @braveOrange;
@switchBG_off: #d3d3d3;
@switchBG_on: #ff6000;
@switchBG_off: #ccc;
@switchBG_off_lrg: #adadad;
@switchBG_dis: #e8e8e8;
@switchBGTransition: background-color 100ms;
Expand Down Expand Up @@ -95,14 +95,15 @@

@white25: rgba(255, 255, 255, 0.25);
@white50: rgba(255, 255, 255, 0.5);
@white75: rgba(255, 255, 255, 0.75);
@gray25: rgba(116, 116, 130, 0.25);
@gray50: rgba(116, 116, 130, 0.5);
@black10: rgba(0, 0, 0, 0.1);
@black25: rgba(0, 0, 0, 0.25);
@black50: rgba(0, 0, 0, 0.5);
@black75: rgba(0, 0, 0, 0.75);

@buttonShadow: 0px 1px 5px -1px rgba(0, 0, 0, 1.0);
@buttonShadow: 0px 1px 5px -1px rgba(0, 0, 0, 0.5);
@dialogShadow: 0px 8px 22px 0px rgba(0, 0, 0, .5);
@softBoxShadow: 0 4px 8px @lightGray;
@lightBoxShadow: 0 2px 2px @lightGray;
Expand Down
2 changes: 1 addition & 1 deletion less/window.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@import "variables.less";

:root {
--default-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
--default-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", sans-serif;
}

* {
Expand Down