From 3a750dad1364c366887abaa64c25de49a629cd79 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 14 Jul 2015 16:12:10 -0700 Subject: [PATCH] Revert custom themes The customizable themes were not actually ready for merge. --- notebook/static/base/less/page.less | 2 +- notebook/static/notebook/less/ansicolors.less | 16 +++++----- notebook/static/notebook/less/cell.less | 6 ++-- notebook/static/notebook/less/highlight.less | 20 ++++++------ notebook/static/notebook/less/variables.less | 8 ++--- notebook/static/style/ipython.less | 3 -- notebook/static/style/style.less | 3 -- notebook/static/themes/default.less | 26 --------------- notebook/static/themes/eighties.less | 25 --------------- notebook/static/themes/theme.less | 32 ------------------- notebook/static/tree/less/tree.less | 10 +++--- 11 files changed, 30 insertions(+), 121 deletions(-) delete mode 100644 notebook/static/themes/default.less delete mode 100644 notebook/static/themes/eighties.less delete mode 100644 notebook/static/themes/theme.less diff --git a/notebook/static/base/less/page.less b/notebook/static/base/less/page.less index 1e0a9d076..754ca6cc3 100644 --- a/notebook/static/base/less/page.less +++ b/notebook/static/base/less/page.less @@ -47,7 +47,7 @@ body { #header-spacer { width: 100%; visibility: hidden; - + @media print { display: none; } diff --git a/notebook/static/notebook/less/ansicolors.less b/notebook/static/notebook/less/ansicolors.less index f7ae8173f..7f15301b8 100644 --- a/notebook/static/notebook/less/ansicolors.less +++ b/notebook/static/notebook/less/ansicolors.less @@ -4,20 +4,20 @@ /* use dark versions for foreground, to improve visibility */ .ansiblack {color: black;} -.ansired {color: @ansired;} -.ansigreen {color: @ansigreen;} +.ansired {color: darkred;} +.ansigreen {color: darkgreen;} .ansiyellow {color: #c4a000;} -.ansiblue {color: @ansiblue;} +.ansiblue {color: darkblue;} .ansipurple {color: darkviolet;} -.ansicyan {color: @ansicyan;} +.ansicyan {color: steelblue;} .ansigray {color: gray;} /* and light for background, for the same reason */ .ansibgblack {background-color: black;} -.ansibgred {background-color: darken(@ansired, 20%);} -.ansibggreen {background-color: darken(@ansigreen, 20%);} +.ansibgred {background-color: red;} +.ansibggreen {background-color: green;} .ansibgyellow {background-color: yellow;} -.ansibgblue {background-color: darken(@ansiblue, 20%);} +.ansibgblue {background-color: blue;} .ansibgpurple {background-color: magenta;} -.ansibgcyan {background-color: darken(@ansicyan, 20%);;} +.ansibgcyan {background-color: cyan;} .ansibggray {background-color: gray;} diff --git a/notebook/static/notebook/less/cell.less b/notebook/static/notebook/less/cell.less index e124e4571..d44d0928e 100644 --- a/notebook/static/notebook/less/cell.less +++ b/notebook/static/notebook/less/cell.less @@ -15,7 +15,7 @@ div.cell { } .edit_mode &.selected { - border-color: @color-muted-5; + border-color: green; /* Don't border the cells when printing */ @media print { border-color: transparent; @@ -37,7 +37,7 @@ div.cell { margin: 0px; font-family: @font-family-monospace; text-align: right; - /* This has to match that of the the CodeMirror class line-height below */ + /* This has to match that of the the CodeMirror class line-height below */ line-height: @code_line_height; } @@ -82,7 +82,7 @@ div.unrecognized_cell { // from text_cell padding: 5px 5px 5px 0px; .hbox(); - + .inner_cell { .border-radius(@border-radius-base); padding: 5px; diff --git a/notebook/static/notebook/less/highlight.less b/notebook/static/notebook/less/highlight.less index 28e8917c4..d0b2bf2ae 100644 --- a/notebook/static/notebook/less/highlight.less +++ b/notebook/static/notebook/less/highlight.less @@ -7,6 +7,8 @@ Adapted from GitHub theme @import (reference) "highlight-refs.less"; +@highlight-base: #000; + .highlight-base{ color: @highlight-base; } @@ -24,16 +26,16 @@ Adapted from GitHub theme } .highlight-string{ - color: @highlight-string; + color: #BA2121; } .highlight-comment{ - color: @color-muted-5; + color: #408080; font-style: italic; } .highlight-number{ - color: @color-accent-3; + color: #080; } .highlight-atom{ @@ -41,7 +43,7 @@ Adapted from GitHub theme } .highlight-keyword{ - color: @highlight-keyword; + color: #008000; font-weight: bold; } @@ -50,11 +52,11 @@ Adapted from GitHub theme } .highlight-error{ - color: @highlight-error; + color: #f00; } .highlight-operator{ - color: @color-accent-1; + color: #AA22FF; font-weight: bold; } @@ -62,12 +64,8 @@ Adapted from GitHub theme color: #AA22FF; } -.highlight-cursor { - border-left: 1px solid @color-muted-6; -} - /* previously not defined, copying from default codemirror */ -.highlight-def{ color: @color-accent-2; } +.highlight-def{ .cm-s-default.cm-def() } .highlight-punctuation{ .cm-s-default.cm-punctuation() } .highlight-property{ .cm-s-default.cm-property() } .highlight-string-2{ .cm-s-default.cm-string-2() } diff --git a/notebook/static/notebook/less/variables.less b/notebook/static/notebook/less/variables.less index c9b5eaf52..76d56398f 100644 --- a/notebook/static/notebook/less/variables.less +++ b/notebook/static/notebook/less/variables.less @@ -10,8 +10,8 @@ @notebook_line_height: 20px; @code_line_height: 1.21429em; // changed from 1.231 to get 17px even @code_padding: 0.4em; // 5.6 px -@rendered_html_border_color: @color-muted-3; -@input_prompt_color: @color-accent-1; -@output_prompt_color: @color-accent-2; -@output_pre_color: @color-muted-6; +@rendered_html_border_color: black; +@input_prompt_color: navy; +@output_prompt_color: darkred; +@output_pre_color: black; @notification_widget_bg: rgba(240, 240, 240, 0.5); diff --git a/notebook/static/style/ipython.less b/notebook/static/style/ipython.less index f3a3e5fa9..d09fa90a1 100644 --- a/notebook/static/style/ipython.less +++ b/notebook/static/style/ipython.less @@ -2,9 +2,6 @@ @import "../components/bootstrap/less/variables.less"; @import "../components/bootstrap/less/mixins.less"; -// theme -@import "../themes/theme.less"; - // minimal imports from font-awesome @import "../components/font-awesome/less/variables.less"; diff --git a/notebook/static/style/style.less b/notebook/static/style/style.less index b16821be3..8dbbda896 100644 --- a/notebook/static/style/style.less +++ b/notebook/static/style/style.less @@ -31,6 +31,3 @@ // terminal @import "../terminal/less/terminal.less"; - -// theme -@import "../themes/theme.less"; diff --git a/notebook/static/themes/default.less b/notebook/static/themes/default.less deleted file mode 100644 index 1868ea950..000000000 --- a/notebook/static/themes/default.less +++ /dev/null @@ -1,26 +0,0 @@ -// Tomorrow theme, light - -// Muted, gray-ish colors -@color-muted-1: #ffffff; -@color-muted-2: #e0e0e0; -@color-muted-3: #c5c8c6; -@color-muted-4: #b4b7b4; -@color-muted-5: #969896; -@color-muted-6: #373b41; -@color-muted-7: #282a2e; -@color-muted-8: #1d1f21; - -// Bright colors -@color-primary: #81a2be; -@color-error: #cc6666; -@color-success: #b5bd68; -@color-accent-1: #de935f; -@color-accent-2: #f0c674; -@color-accent-3: #8abeb7; -@color-accent-4: #b294bb; -@color-accent-5: #a3685a; - -// Bootstrap overrides -@font-family-monospace: monospace; // to allow user to customize their fonts -@font-size-base: 13px; - diff --git a/notebook/static/themes/eighties.less b/notebook/static/themes/eighties.less deleted file mode 100644 index cedb8fab5..000000000 --- a/notebook/static/themes/eighties.less +++ /dev/null @@ -1,25 +0,0 @@ -// Eighties theme, dark - -// Muted, gray-ish colors -@color-muted-1: #2d2d2d; -@color-muted-2: #393939; -@color-muted-3: #515151; -@color-muted-4: #747369; -@color-muted-5: #a09f93; -@color-muted-6: #d3d0c8; -@color-muted-7: #f2f0ec; -@color-muted-8: #e8e6df; - -// Bright colors -@color-primary: #6699cc; -@color-error: #f2777a; -@color-success: #99cc99; -@color-accent-1: #f99157; -@color-accent-2: #ffcc66; -@color-accent-3: #66cccc; -@color-accent-4: #cc99cc; -@color-accent-5: #d27b53; - -// Bootstrap overrides -@font-family-monospace: monospace; // to allow user to customize their fonts -@font-size-base: 13px; diff --git a/notebook/static/themes/theme.less b/notebook/static/themes/theme.less deleted file mode 100644 index 0e90680d6..000000000 --- a/notebook/static/themes/theme.less +++ /dev/null @@ -1,32 +0,0 @@ -@import "default.less"; - -@body-bg: @color-muted-1; -@brand-primary: @color-primary; -@brand-success: @color-success; -@text-color: @color-muted-7; -@table-border-color: @color-muted-3; -@table-border-highlight: @color-muted-7; -@page-backdrop-color: @color-muted-2; -@navbar-default-bg: @color-muted-2; - -@gray-base: @color-muted-1; -@gray-darker: @color-muted-2; -@gray-dark: @color-muted-3; -@gray: @color-muted-4; -@gray-light: @color-muted-5; -@gray-lighter: @color-muted-6; - -// IPython colors -@border_color: @color-muted-4; - -// Highlight colors -@highlight-base: @color-muted-6; -@highlight-keyword: @color-accent-4; -@highlight-error: @color-error; -@highlight-string: @color-success; - -// ANSI -@ansired: @color-error; -@ansigreen: @color-success; -@ansicyan: @color-accent-3; -@ansiblue: @color-primary; diff --git a/notebook/static/tree/less/tree.less b/notebook/static/tree/less/tree.less index 5b1441932..19798e3b4 100644 --- a/notebook/static/tree/less/tree.less +++ b/notebook/static/tree/less/tree.less @@ -33,7 +33,7 @@ ul.breadcrumb { font-size: 16px; margin-right: 4px; } - + span { color: @dark_dashboard_color; } @@ -59,7 +59,7 @@ ul.breadcrumb { .list_header { font-weight: bold; - background-color: @page-backdrop-color; + background-color: @page-backdrop-color } .list_placeholder { @@ -94,7 +94,7 @@ ul.breadcrumb { }; a {text-decoration: none;} &:hover { - background-color: @table-border-highlight; + background-color: darken(white,2%); } } @@ -131,7 +131,7 @@ ul.breadcrumb { } .item_icon { - font-size: 14px; + font-size: 14px; color: @dark_dashboard_color; margin-right: @dashboard_lr_pad; margin-left: @dashboard_lr_pad; @@ -271,7 +271,7 @@ ul#new-menu { padding-left: @dashboard_lr_pad; padding-right: @dashboard_lr_pad; line-height: @btn_mini_height; - + a:focus, a:hover { text-decoration: none; }