Permalink
Browse files

Merge remote-tracking branch 'origin/master' into tvoliter/menus

* origin/master:
  Updated CodeMirror SHA--got out of date
  use font stack variable wherever font-family is specified
  fix typo
  Fix font-size on windows. Move @scaleX mixin to brackets_mixins.less.
  refactor bootstrap font stacks to use variables. update @import statements to use url().
  • Loading branch information...
2 parents 3df6b61 + 0077f58 commit 3b44f2f851ddc9361471e151a87b571b5920d7a3 @tvoliter tvoliter committed Apr 17, 2012
View
10 src/styles/bootstrap/mixins.less
@@ -44,26 +44,30 @@
}
// Font Stacks
+@fontStackSansSerif: "Helvetica Neue", Helvetica, Arial, sans-serif;
+@fontStackSerif: "Georgia", Times New Roman, Times, serif;
+@fontStackMonospace: "Monaco", Courier New, monospace;
+
#font {
.shorthand(@weight: normal, @size: 14px, @lineHeight: 20px) {
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
}
.sans-serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
- font-family: 'SourceSans', Helvetica, Arial, sans-serif;
+ font-family: @fontStackSansSerif;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
}
.serif(@weight: normal, @size: 14px, @lineHeight: 20px) {
- font-family: "Georgia", Times New Roman, Times, serif;
+ font-family: @fontStackSerif;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
}
.monospace(@weight: normal, @size: 12px, @lineHeight: 20px) {
- font-family: "Monaco", Courier New, monospace;
+ font-family: @fontStackMonospace;
font-size: @size;
font-weight: @weight;
line-height: @lineHeight;
View
24 src/styles/brackets.less
@@ -334,7 +334,7 @@ a, img {
background-color: @inline-background-color-1;
.filename {
- font-family: 'SourceSans', sans-serif;
+ font-family: @fontStackSansSerif;
font-size: 1.1em;
color: @inline-color-1;
padding: 10px 10px 0px 10px;
@@ -382,23 +382,8 @@ a, img {
.relatedContainer {
@top-margin: 12px;
- /* use scaling on CSS triangle to get desired size without jaggies */
- .scaleX (@value: 1.0) {
- -ms-transform: scaleX(@value);
- -moz-transform: scaleX(@value);
- -webkit-transform: scaleX(@value);
- -o-transform: scaleX(@value);
- transform: scaleX(@value);
-
- -ms-transform-origin: 0 0;
- -moz-transform-origin: 0 0;
- -webkit-transform-origin: 0 0;
- -o-transform-origin: 0 0;
- transform-origin: 0 0;
- }
-
/*width: 0;*/
- font-family: 'SourceSans', sans-serif;
+ font-family: @fontStackSansSerif;
position: fixed;
width: 250px;
overflow: hidden;
@@ -436,6 +421,7 @@ a, img {
}
.related {
+ /*font-size: 12px;*/
position: absolute;
top: 0;
left: 1px;
@@ -470,7 +456,7 @@ a, img {
}
.CodeMirror-dialog > div {
- font-family: 'SourceSans', sans-serif;
+ font-family: @fontStackSansSerif;
position: absolute;
top: 0; left: 0; right: 0;
background: @background-color-2;
@@ -483,7 +469,7 @@ a, img {
}
.CodeMirror-dialog input {
- font-family: 'SourceSans', sans-serif;
+ font-family: @fontStackSansSerif;
border: 1px solid @content-color-weaker;
outline: none;
background: @background-color-3;
View
3 src/styles/brackets_bootstrap_override.less
@@ -0,0 +1,3 @@
+// Font Stacks
+
+@fontStackSansSerif: 'SourceSans', Helvetica, Arial, sans-serif;
View
16 src/styles/brackets_mixins.less
@@ -63,3 +63,19 @@
.spriteSwap(@xOffset, @yOffset) {
background-position: -@xOffset -@yOffset;
}
+
+
+/* Scale x-axis using top-left as the origin */
+.scaleX (@value: 1.0) {
+ -ms-transform: scaleX(@value);
+ -moz-transform: scaleX(@value);
+ -webkit-transform: scaleX(@value);
+ -o-transform: scaleX(@value);
+ transform: scaleX(@value);
+
+ -ms-transform-origin: 0 0;
+ -moz-transform-origin: 0 0;
+ -webkit-transform-origin: 0 0;
+ -o-transform-origin: 0 0;
+ transform-origin: 0 0;
+}
View
23 src/styles/brackets_shared.less
@@ -12,28 +12,31 @@
/* CSS imports */
// CodeMirror
-@import "thirdparty/CodeMirror2/lib/codemirror.css";
+@import url(thirdparty/CodeMirror2/lib/codemirror.css);
/* LESS imports */
// Bootstrap @ v.1.4.0
-@import "bootstrap/bootstrap.less";
+@import url(bootstrap/bootstrap.less);
// Brackets-specific variables, mixins and overrides
-@import "brackets_variables.less";
-@import "brackets_mixins.less";
-@import "brackets_patterns_override.less";
+@import url(brackets_variables.less);
+@import url(brackets_mixins.less);
+@import url(brackets_patterns_override.less);
// Brackets-specific default font and color definitions
-@import "brackets_fonts.less";
-@import "brackets_colors.less";
+@import url(brackets_fonts.less);
+@import url(brackets_colors.less);
// Default theme -- all UI styling comes from variables in a theme
// Themes can rely on variables defined above
-@import "brackets_theme_default.less";
+@import url(brackets_theme_default.less);
// Codemirror styling overrides
-@import "brackets_codemirror_override.less";
+@import url(brackets_codemirror_override.less);
+
+// Bootstrap styling overrides
+@import url(brackets_bootstrap_override.less);
// styling for file tree
-@import "jsTreeTheme.less";
+@import url(jsTreeTheme.less);
2 src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 0ae76a0e2f98726c9b9b2c17d7ecc7433d7b344b
+Subproject commit 1f1fec00587293af442bb059e435d10eadee9e58

0 comments on commit 3b44f2f

Please sign in to comment.