Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
c29cb04
Merge branch 'release' of https://github.com/adobe/brackets
larz0 Jul 28, 2014
ce5e7ac
Merge branch 'release' of https://github.com/adobe/brackets
Jul 30, 2014
a92fdb1
Merge branch 'master' of https://github.com/adobe/brackets
larz0 Aug 1, 2014
53b332b
Merge branch 'master' of https://github.com/adobe/brackets
larz0 Aug 1, 2014
167c7c6
Merge branch 'master' of https://github.com/adobe/brackets
Aug 2, 2014
4172d1b
Merge branch 'master' of https://github.com/adobe/brackets
Aug 5, 2014
99c8e9f
Merge branch 'master' of https://github.com/adobe/brackets
larz0 Aug 5, 2014
a2e18a9
Updated variables in brackets.less.
larz0 Aug 5, 2014
ab59337
Updated variables in brackets_codemirror_override.less.
larz0 Aug 5, 2014
1261384
Added Core UI variables.
larz0 Aug 5, 2014
7f45d7a
brackets_patterns_override.less partially done.
larz0 Aug 5, 2014
9172cd3
Merge branch 'master' of https://github.com/adobe/brackets
Aug 6, 2014
f68b55c
Merge branch 'master' of https://github.com/adobe/brackets
larz0 Aug 6, 2014
52a5719
Corrected variable references in test files.
larz0 Aug 6, 2014
d04c93a
brackets_patterns_override.less WIP
larz0 Aug 6, 2014
452c2ef
Swapped out all the variables.
larz0 Aug 6, 2014
add4086
Merged with master.
larz0 Aug 6, 2014
a1a4db3
Image asset update.
larz0 Aug 6, 2014
c0b44b1
Merge branch 'master' into larz/clean-up-for-dark-ui
larz0 Aug 6, 2014
99fe5ea
Swapped more variables.
larz0 Aug 6, 2014
f802039
Completed swapping variables.
larz0 Aug 6, 2014
7771728
Merge branch 'master' of https://github.com/adobe/brackets
Aug 7, 2014
a07d152
More clean up.
Aug 7, 2014
6656401
Added variables to the rest of the core extensions.
Aug 7, 2014
f3f3d22
Missed a spot.
Aug 7, 2014
ce3d2e5
Made strings, numbers and other values a tad darker to be more like o…
larz0 Aug 7, 2014
0663642
Merge branch 'master' of https://github.com/adobe/brackets
Aug 11, 2014
4c868f3
Merge branch 'master' of https://github.com/adobe/brackets into larz/…
larz0 Aug 11, 2014
877c0af
Applied dark variables to brackets.less
larz0 Aug 11, 2014
4aaad92
Merge branch 'larz/dark-ui' of https://github.com/adobe/brackets into…
Aug 12, 2014
73158ef
Add dark variables to brackets.less and brackets_patterns_override.less.
Aug 12, 2014
1a5ee90
Missed a few spots.
Aug 12, 2014
aa6dec5
Applied dark variables to quick docs.
Aug 12, 2014
b3ee843
Spacing fix.
Aug 12, 2014
d465c33
Removed unnecessary dark style.
Aug 12, 2014
1fcc4f5
Applied dark style to Recent Projects.
Aug 12, 2014
1e258cc
Typo.
Aug 12, 2014
46fc63c
Applied dark style to Quick View.
Aug 12, 2014
cec4b66
Tweaks.
Aug 12, 2014
8e8d1b7
image used for arrow affected width of popover
redmunds Aug 13, 2014
a64d4a3
Merge branch 'larz/dark-ui' of https://github.com/adobe/brackets into…
Aug 13, 2014
3f62d00
Moved dark scrollbars in brackets_theme_default.less to brackets_scro…
Aug 13, 2014
0c26073
Missed dark JS Code Hint colors.
Aug 13, 2014
ac2a433
Adding background color to contributor images because certain images …
Aug 13, 2014
90b15ae
Added dark grid background to dark quick view.
Aug 13, 2014
d69e6fd
Missed code-font() dark style.
Aug 13, 2014
7e14288
Tweaked dark status bar separators and highlight color.
Aug 13, 2014
db52a4e
Tweaks.
Aug 13, 2014
d77df94
Fixed indentation.
Aug 13, 2014
b257b75
Misc tweaks.
larz0 Aug 13, 2014
436edbd
Removed quotation marks.
larz0 Aug 13, 2014
ee29033
Possible fix for Windows quiet scrollbars.
Aug 14, 2014
b7403e5
Oops.
Aug 14, 2014
30d5e90
Partially styled <select> elements.
Aug 14, 2014
b458a5e
Color variable names were wrong.
Aug 14, 2014
c9781e9
Fixed input error border.
larz0 Aug 14, 2014
b881efe
Linux toolbar styling.
larz0 Aug 14, 2014
3a86cd7
Select element fully styled thanks to Randy!
Aug 15, 2014
e223a53
Fixed missed JS hint styling based on mackenza's feedback.
Aug 15, 2014
d2a7e2d
Styled extension warning based on Marcel's feedabck.
Aug 15, 2014
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
6 changes: 5 additions & 1 deletion src/extensions/default/DarkTheme/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

.CodeMirror-focused .CodeMirror-activeline {
.CodeMirror-gutter-elt {
background: #000;
background: @background;
color: #fff;
}
.inline-widget .CodeMirror-gutter-elt {
Expand Down Expand Up @@ -92,6 +92,10 @@
border-right: none;
}

.CodeMirror-linenumber {
color: #767676;
}

.CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt {
color: #fff;
}
Expand Down
6 changes: 3 additions & 3 deletions src/extensions/default/InlineColorEditor/css/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@

// Dark UI theme

@dark-bc-bg-highlight: #1671db;
@dark-bc-bg-highlight: #005ecc;
@dark-bc-highlight: rgba(255, 255, 255, 0.06);
@dark-bc-text: #ddd;
@dark-bc-text: #ccc;
@dark-bc-text-alt: #fff;
@dark-bc-highlight-hard: rgba(255, 255, 255, 0.1);
@dark-bc-btn-bg: #3f3f3f;
Expand Down Expand Up @@ -451,4 +451,4 @@
background-image: @dark-swatch-bg-2x;
}
}
}
}
15 changes: 7 additions & 8 deletions src/extensions/default/InlineTimingFunctionEditor/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@
}

.bezier-curve-editor .control-point {
background: -webkit-linear-gradient(270deg, rgb(249, 249, 249) 50%, rgb(237, 237, 237) 50%);
background: #e5e9e9;
position: absolute;
z-index: 2;
height: 16px;
width: 16px;
border: 1px solid #9c9e9e;
border: 1px solid #b2b5b5;
margin: -8px 0 0 -8px;
outline: none;
padding: 0 !important;
Expand All @@ -103,12 +103,12 @@
}

.bezier-curve-editor .control-point:focus {
border: 1px solid #0940fd !important;
box-shadow: 0 0 0 2px #6fb5f1;
border: 1px solid #2893ef !important;
box-shadow: 0 0 0 2px #94ceff;
}

.bezier-curve-editor .P0, .bezier-curve-editor .P3 {
background: #1461FC;
background: #2893ef;
border-radius: 0;
border: none;
height: 12px;
Expand Down Expand Up @@ -301,11 +301,10 @@

/* Dark UI theme */

@dark-bc-bg-highlight: #1671db;
@dark-bc-bg-highlight: #005ecc;
@dark-bc-highlight: rgba(255, 255, 255, 0.06);
@dark-bc-text: #ddd;
@dark-bc-text: #ccc;
@dark-bc-text-alt: #fff;
@dark-bc-highlight-hard: rgba(255, 255, 255, 0.1);
@dark-bc-btn-bg: #3f3f3f;
@dark-bc-btn-border: #202020;
@dark-bc-btn-border-focused: #2893ef;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,33 @@
.brackets-js-hints .current-parameter {
font-weight: 500;
}

/* Dark Styles */

.dark .brackets-js-hints.priority-high {
color: #a1f200; /* green */
}

.dark .brackets-js-hints.priority-medium {
color: #3ff8ff; /* blue */
}

.dark .brackets-js-hints.priority-low {
color: #e6adff; /* violet */
}

.dark .brackets-js-hints.priority-lowest {
color: #bbb; /* dark grey */
}

.dark .brackets-js-hints.literal-hint {
color: #bbb; /* dark grey */
font-family: SourceCodePro;
}

.dark #function-hint-container {
background: #000;
border: 1px solid rgba(255,255,255,0.15);
color: #fff;
box-shadow: 0 3px 9px rgba(0, 0, 0, 0.24);
}
108 changes: 0 additions & 108 deletions src/extensions/default/QuickView/QuickView.css

This file was deleted.

139 changes: 139 additions & 0 deletions src/extensions/default/QuickView/QuickView.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
@bc-highlight: rgba(255, 255, 255, 0.12);
@bc-panel-bg: #dfe2e2;
@bc-panel-bg-promoted: #d4d7d7;
@bc-shadow-large: rgba(0, 0, 0, 0.5);
@bc-shadow-small: rgba(0, 0, 0, 0.06);
@bc-text: #333;

@dark-bc-highlight: rgba(255, 255, 255, 0.06);
@dark-bc-panel-bg: #2c2c2c;
@dark-bc-panel-bg-promoted: #222;
@dark-bc-shadow-large: rgba(0, 0, 0, 0.5);
@dark-bc-shadow-small: rgba(0, 0, 0, 0.06);
@dark-bc-text: #ccc;

#quick-view-container {
display: none;

-webkit-transition: opacity 0.125s ease-in, -webkit-transform 0.125s;
transition: opacity 0.125s ease-in, transform 0.125s;

-webkit-transform: scale(0);
transform: scale(0);
opacity: 0;

background: @bc-panel-bg;
position: absolute;
z-index: 5000;
pointer-events: none;

padding: 8px;
text-align: center;

border-radius: 4px;
box-shadow: 0 4px 15px @bc-shadow-large;

.dark & {
background: @dark-bc-panel-bg;
box-shadow: 0 4px 15px @dark-bc-shadow-large;
}
}

#quick-view-container.active {
-webkit-transform: scale(1);
transform: scale(1);
opacity: 1;
}

#quick-view-container .preview-content {
background-image: url(preview_bg.png);
border-radius: 2px;
box-shadow: 0 -1px 2px @bc-shadow-small, 0 1px 0 @bc-highlight;

.dark & {
box-shadow: 0 -1px 2px @dark-bc-shadow-small, 0 1px 0 @dark-bc-highlight;
background-image: url(preview_bg_dark.png);
}
}


#quick-view-container .color-swatch {
width: 40px;
height: 40px;
background-size: 100%;
}

#quick-view-container .image-preview {
line-height: 0;
}

#quick-view-container .image-preview img {
min-width: 100px;
max-width: 200px;
max-height: 200px;
}

#quick-view-container .img-size {
background-color: @bc-panel-bg-promoted;
border-top: 1px solid @bc-highlight;
font-size: 0.9em;
color: @bc-text;
padding-left: 3px;
margin-top: 0;
text-align: left;
text-shadow: 0 1px 0px @bc-highlight;

.dark & {
background-color: @dark-bc-panel-bg-promoted;
border-top: 1px solid @dark-bc-highlight;
color: @dark-bc-text;
text-shadow: 0 1px 0px @dark-bc-highlight;
}
}

#quick-view-container.preview-bubble-above {
-webkit-transform-origin: center bottom;
}

#quick-view-container.preview-bubble-above:before {
display: none;
}

#quick-view-container.preview-bubble-above:after,
#quick-view-container.preview-bubble-below:before {
width: 0;
height: 0;
content: '';
position: absolute;
left: 50%;
bottom: -9px;
margin-left: -10px;
z-index: 999;
display: block;
border-top: 10px solid @bc-panel-bg;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pure CSS Arrow - nice!

border-left: 10px solid transparent;
border-right: 10px solid transparent;
-webkit-filter: drop-shadow(0px 1px 0 rgba(0, 0, 0, 0.18));

.dark & {
border-top: 10px solid @dark-bc-panel-bg;
}
}

#quick-view-container.preview-bubble-below {
-webkit-transform-origin: center top;
}

#quick-view-container.preview-bubble-below:before {
-webkit-filter: drop-shadow(0px 1px 0 rgba(255, 255, 255, 0.18));
-webkit-transform: rotate(180deg);
top: -9px;
}

#quick-view-container.preview-bubble-below:after {
display: none;
}

.quick-view-highlight {
background-color: rgba(200, 200, 150, 0.4);
}
9 changes: 6 additions & 3 deletions src/extensions/default/QuickView/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ define(function (require, exports, module) {
thisSize,
i;


// find lower bound
for (i = 0; i < params.length; i++) {
args = params[i].split(" ");
Expand Down Expand Up @@ -335,7 +334,11 @@ define(function (require, exports, module) {
for (i = 0; i < params.length; i++) {
args = params[i].split(" ");
if (isGradientColorStop(args) && hasLengthInPixels(args)) {
thisSize = ((parseFloat(args[1]) + lowerBound) / upperBound) * 100;
if (upperBound === 0) {
thisSize = 0;
} else {
thisSize = ((parseFloat(args[1]) + lowerBound) / upperBound) * 100;
}
args[1] = thisSize + "%";
}
params[i] = args.join(" ");
Expand Down Expand Up @@ -748,7 +751,7 @@ define(function (require, exports, module) {
$previewContent = $previewContainer.find(".preview-content");

// Load our stylesheet
ExtensionUtils.loadStyleSheet(module, "QuickView.css");
ExtensionUtils.loadStyleSheet(module, "QuickView.less");

// Register command
CommandManager.register(Strings.CMD_ENABLE_QUICK_VIEW, CMD_ENABLE_QUICK_VIEW, toggleEnableQuickView);
Expand Down
Loading