Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Applied Typographic Tweaks #4930

Merged
merged 11 commits into from
Oct 1, 2013
3 changes: 2 additions & 1 deletion src/styles/brackets_colors.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
@tc-icon-down: 0.5;
@tc-disabled-opacity: 0.3;

@tc-link: #0083e8;
@tc-link-hover: #0083e8;
@tc-dropdown-shadow: 0 3px 9px rgba(0, 0, 0, 0.24);
@tc-gray-panel: #dfe2e2;
@tc-gray-panel-border: rgba(0, 0, 0, 0.12);
Expand Down Expand Up @@ -112,4 +114,3 @@
@tc-light-weight-quiet-text: #777;
@tc-warning-background: #FDF5CC;
@tc-warning-text: #635301;

71 changes: 38 additions & 33 deletions src/styles/brackets_patterns_override.less
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,30 @@
*
*/

/* Variable OVerride */
/* Variable Overrides */

@tooltipBackground: #fff;
@tooltipArrowColor: @tooltipBackground;
@tooltipBackground: #fff;
@tooltipArrowColor: @tooltipBackground;

/* Links */

a {
color: @tc-link;
text-decoration: none;
}

a:hover {
color: @tc-link-hover;
text-decoration: underline;
}

a:focus {
color: @tc-link-hover;
outline: 0;
border-radius: 3px;
box-shadow: @tc-input-glow;
text-decoration: none;
}

.panel {
.vbox;
Expand Down Expand Up @@ -383,7 +403,7 @@

.modal .close {
cursor: default;
margin: 10px 5px 0 0;
margin: 7px 5px 0 0;
}

.modal-header {
Expand All @@ -404,6 +424,7 @@
background-color: @tc-gray-panel;
border-top: 1px solid @tc-gray-panel-separator;
box-shadow: none;
padding: 10px 15px 12px;
white-space: nowrap;
}

Expand Down Expand Up @@ -433,16 +454,6 @@
}
}

// Work around #4568: SourceSans is much fainter on Win than Mac, especially small text with "light" font-weight.
// We fix some of the most egregious cases by using a heavier font-weight only on Win (and because that's usually
// overkill, we also make the color paler to dial it back down a bit).
.less-faint-on-win() {
body.platform-win & {
font-weight: normal;
color: #2e2e2e;
}
}

.modal-body ul {
/* Bootstrap's type.less defines a heavy margin-bottom on ul/ol that we don't want in dialogs
since they have heavy padding instead. */
Expand All @@ -462,18 +473,17 @@
color: @tc-light-weight-text;
margin-bottom: 0;
margin-top: 0;
font-size: 26px;
line-height: 40px;
font-weight: @font-weight-light;
font-size: 22px;
line-height: 30px;
font-weight: normal;
}

.dialog-message {
color: @tc-light-weight-text;
color: @tc-text;
font-size: 14px;
line-height: 20px;
margin-bottom: 20px;
font-weight: @font-weight-light;
.less-faint-on-win();
font-weight: normal;
}

.dialog-message li {
Expand Down Expand Up @@ -502,10 +512,7 @@
.dialog-filename {
word-wrap: break-word;

font-weight: normal;
body.platform-win & { // maintain contrast next to ".less-faint-on-win()" workaround
font-weight: @font-weight-semibold;
}
font-weight: @font-weight-semibold;
}

/* Any Dialog text in this style is automatically turned into a link that opens in the browser. Use href for the link's target. */
Expand Down Expand Up @@ -699,19 +706,17 @@ a[href^="http"] {
width: 220px;
}
.ext-name {
color: @tc-text;
display: block;
color: #000;
font-size: 15px;
font-weight: @font-weight-light;
.less-faint-on-win();
font-weight: normal;
.user-select(text);
cursor: text;
}
.ext-desc {
color: #000;
font-weight: @font-weight-light;
.less-faint-on-win();
width: auto;
color: @tc-text;
font-weight: normal;
.user-select(text);
cursor: text;
}
Expand Down Expand Up @@ -790,7 +795,6 @@ a[href^="http"] {
.dialog-message {
font-size: 14px;
line-height: 17px;
.less-faint-on-win();

// Enable text selection
cursor: auto;
Expand All @@ -817,8 +821,10 @@ input[type="color"],
.uneditable-input {
background-color: @tc-input-background;
border: 1px solid @tc-input-border;
color: @tc-text;
color: @tc-light-weight-text;
font-size: (@baseFontSize + 1px);
font-weight: normal;
-webkit-font-smoothing: antialiased;
.border-radius(@tc-control-border-radius);
.box-shadow(@tc-input-inner-shadow);
.transition(~"border linear 0s, box-shadow linear 0s");
Expand All @@ -832,7 +838,6 @@ input[type="color"],
&:focus {
outline: 0;
background-color: @tc-input-background;
color: @tc-text;
text-shadow: none;
border: 1px solid @tc-gray-component-focused-border;
box-shadow: @tc-input-inner-shadow, @tc-input-glow;
Expand Down