]> git.rmz.io Git - dotfiles.git/commitdiff
Merge branch 'master' of rmz.io:dotfiles
authorSamir Benmendil <me@rmz.io>
Fri, 3 Jul 2015 21:27:50 +0000 (21:27 +0000)
committerSamir Benmendil <me@rmz.io>
Fri, 3 Jul 2015 21:27:50 +0000 (21:27 +0000)
44 files changed:
.gitmodules
aliases
awesome/topbar.lua
awesome/widgets/pomodoro [new submodule]
awesome/widgets/pomodoro.lua [new file with mode: 0644]
dwb/default/bookmarks
dwb/default/cookies.allow
dwb/default/scripts.allow
dwb/forms
dwb/keys
dwb/userscripts/extension_loader.js
dwb/userstyles/github.com.css
dwb/userstyles/stackoverflow.com.css
dwb/userstyles/trakt.tv.css
dwb/userstyles/xkcd.com.css [new file with mode: 0644]
flexget/config.yml
git/config
mpv/config
msmtprc
mutt/colors
mutt/muttrc
ranger/rc.conf
ranger/rifle.conf
tmux.conf
vim/filetype.vim
vim/ftplugin/help.vim
vim/ultisnips/PKGBUILD.snippets
vim/ultisnips/all.snippets
vim/ultisnips/roscfg.snippets [new file with mode: 0644]
vim/ultisnips/rospy.snippets [new file with mode: 0644]
vim/ultisnips/sh.snippets
vim/vimrc
wakeonlan/gallifrey [new file with mode: 0644]
wakeonlan/shada [new file with mode: 0644]
xkb/symbols/dvorak
zsh/aliases/misc.zsh
zsh/lib/00-key-bindings.zsh
zsh/lib/fzf.zsh
zsh/lib/git.zsh [deleted file]
zsh/lib/misc.zsh
zsh/lib/motd.zsh [new file with mode: 0644]
zsh/lib/prompt.zsh [new file with mode: 0644]
zsh/lib/theme-and-appearance.zsh [deleted file]
zsh/themes/ramsi.zsh-theme [deleted file]

index db790744ed911dab5999bbbaca62ff8209128f8d..3905d840eddd07db0354e8bc6f5b4a265a0ac2f1 100644 (file)
@@ -7,3 +7,7 @@
 [submodule "awesome/widgets/net_widgets"]
        path = awesome/widgets/net_widgets
        url = git@github.com:Ram-Z/net_widgets.git
+[submodule "awesome/widgets/pomodoro"]
+       path = awesome/widgets/pomodoro
+       url = git@github.com:/Ram-Z/awesome-pomodoro
+       branch = module-path
diff --git a/aliases b/aliases
index e64bb85f5d8a2c0cc64d9defe2e80aec475ae9c0..92baf77c59a73bfcbf2879c72663b1e625a8015e 100644 (file)
--- a/aliases
+++ b/aliases
@@ -2,6 +2,7 @@
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 
+alias ls='ls --color=auto'
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
 alias ll='ls -lh --color=auto -F'
index 7986af062689ae0f357d1f6e3a0e298e2fbc2984..91b04faccb6c399ca708b7de9006e8aac73bef0b 100644 (file)
@@ -89,6 +89,8 @@ for s = 1, screen.count() do
     local right_layout = wibox.layout.fixed.horizontal()
     if s == 1 then right_layout:add(wibox.widget.systray()) end
     right_layout:add(separator)
+    right_layout:add(require("widgets/pomodoro"))
+    right_layout:add(separator)
     right_layout:add(require("widgets/awesompd"))
     right_layout:add(require("widgets/volume_widget"))
     if utils.host == "chronos" then
diff --git a/awesome/widgets/pomodoro b/awesome/widgets/pomodoro
new file mode 160000 (submodule)
index 0000000..a861385
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit a861385355d0ac10091eda49757fc9eda05480a3
diff --git a/awesome/widgets/pomodoro.lua b/awesome/widgets/pomodoro.lua
new file mode 100644 (file)
index 0000000..3c7af63
--- /dev/null
@@ -0,0 +1,22 @@
+local pomodoro = require("widgets/pomodoro/init")
+local wibox = require("wibox")
+
+-- durations in seconds
+pomodoro.short_pause_duration = 5 * 60
+pomodoro.long_pause_duration = 30 * 60
+pomodoro.work_duration = 25 * 60
+
+-- format string
+pomodoro.format = function (t) return " <b>"..t.."</b>" end
+
+pomodoro.init()
+
+pombox = wibox.layout.fixed.horizontal()
+pombox:add(pomodoro.icon_widget)
+pombox:add(pomodoro.widget)
+
+globalkeys = awful.util.table.join(globalkeys,
+    awful.key({ modkey, "Shift" }, "p", function() pomodoro:start() end)
+)
+
+return pombox
index c38a209351a66dd4a2d9d79b6a85b16292db35a5..173509b342863043474e905b14d0772d28ceea1b 100644 (file)
@@ -4,15 +4,19 @@ http://blog.techdev.de/code-snippet-edit-a-file-in-all-branches-using-git/ Code
 http://chakraos.org/home/ Chakra | Home
 http://eudyptula-challenge.org/ The Eudyptula Challenge
 http://flexget.com/wiki/Plugins Plugins – FlexGet
+http://nosuck.org/2015/04/01/you-are-managing-passwords-wrong-lastpass-and-friends/ You Are Managing Passwords Wrong: LastPass and Friends | No Suck
 http://paste.chakra-project.org/ New paste • The Chakra Project - Pastebin
+http://rsync.chakraos.org/packages/ Index of /packages/
 http://swarmlab.dyndns.org/ KForge - Home
 http://upstream-tracker.org/ Upstream Tracker for C/C++ Libraries
 http://www.ex-parrot.com/~pete/upside-down-ternet.html Upside-Down-Ternet
 http://www.explainxkcd.com/wiki/index.php/Main_Page explain xkcd
 http://www.reddit.com/ reddit: the front page of the internet
+https://code.google.com/p/umh-arvc-ros/source/browse/trunk#trunk%2Fgraph_optimizer_slam%253Fstate%253Dclosed /trunk - umh-arvc-ros - ros packages from the ARVC group at UMH - Google Project Hosting
 https://eleum.unimaas.nl/ Blackboard Learn
 https://mail.google.com Gmail
 https://myum.unimaas.nl/irj/portal MyUm
+https://orcahq.com/ Orca
 https://plus.google.com Google+
 https://tardis:60665/ ZNC - Web Frontend
 https://www.bnpparibasfortis.be/private/Start.asp BNP Paribas Fortis, la banque et l'assurance d'un monde qui change
index 96aaf12242f35a1a0a7c40bd434ad85665377d99..b508efd7dd3337c3bb2efb9babe94c23a08dd02e 100644 (file)
@@ -1,3 +1,4 @@
+.accounts.paradoxplaza.com
 .amazon.co.uk
 .amazon.de
 .awesome.naquadah.org
@@ -24,6 +25,7 @@
 .msvincognito.nl
 .musicbrainz.org
 .ohloh.net
+.paradoxplaza.com
 .playstarbound.com
 .reddit.com
 .redditmedia.com
index 5efba0dd1d3c9c1885de3a07d91dd04f35881a13..40589941daa08a1bc9201212afaf8c14679f72eb 100644 (file)
@@ -13,6 +13,7 @@ github.com
 gitorious.org
 groups.google.com
 guides.github.com
+i.imgur.com
 just-eat.co.uk
 localhost
 mail.google.com
@@ -36,7 +37,9 @@ trakt.tv
 translate.google.com
 twitter.com
 unix.stackexchange.com
+upstream-tracker.org
 upstream.rosalinux.ru
+vi.stackexchange.com
 wiki.ros.org
 www.amazon.co.uk
 www.amazon.com
@@ -46,8 +49,10 @@ www.facebook.com
 www.google.com
 www.humblebundle.com
 www.imdb.com
+www.indeed.co.uk
 www.just-eat.co.uk
 www.loomio.org
+www.paypal.com
 www.reddit.com
 www.ros.org
 www.splitwise.com
index b7d1a24f3386954b5d96f079bdd5a94213ee2d26..3c87b06d8222b94f28d6fb12acbebdda7a6892ac 100644 (file)
Binary files a/dwb/forms and b/dwb/forms differ
index d342bab7dd301423c9be575a9c2d1ac90afe8a02..f9d99db829b5d9a0c9d292ba2def58c8d7aeebe2 100644 (file)
--- a/dwb/keys
+++ b/dwb/keys
@@ -1,16 +1,16 @@
 [default]
-save_search_field=gs
-tab_new=ga
-allow_session_cookie_tmp=CT
-allow_cookie=CC
-allow_session_cookie=CS
-bookmark=M
-buffers=gt
-cancel_download=ad
-sanitize=
-clear_tab=gc
-only=
-close_tab=d
+save_search_field= gs
+tab_new= ga
+allow_session_cookie_tmp= CT
+allow_cookie= CC
+allow_session_cookie= CS
+bookmark= M
+buffers= gt
+cancel_download= ad
+sanitize= 
+clear_tab= gc
+only= 
+close_tab= d
 entry_escape=Control c
 entry_confirm=Control g
 entry_history_back=Control k
@@ -27,152 +27,152 @@ complete_history=Control H
 complete_path=Control p
 complete_searchengines=Control S
 complete_userscript=Control U
-download=gd
+download= gd
 download_set_execute=Control x
-command_mode=:
-tabdo=
-execute_javascript=
-eval=
-execute_userscript=eu
-find_backward_ic=c?
-find_backward=?
-find_forward_ic=c/
-find_forward=/
-find_next=n
-find_previous=N
-focus_input=gi
-focus_next=K
-focus_tab=T
-focus_prev=J
-win_hist_back=wh
-tab_hist_back=th
-history_back=H
-win_hist_forward=wl
-tab_hist_forward=tl
-history_forward=L
-insert_mode=i
-show_keys=Sk
-load_html=
-load_html_tab=
-lock_domain=xd
-lock_uri=xu
-tab_move_left=gl
-tab_move_right=gr
-tab_move=gm
+command_mode= :
+tabdo= 
+execute_javascript= 
+eval= 
+execute_userscript= eu
+find_backward_ic= c?
+find_backward= ?
+find_forward_ic= c/
+find_forward= /
+find_next= n
+find_previous= N
+focus_input= gi
+focus_next= K
+focus_tab= T
+focus_prev= J
+win_hist_back= wh
+tab_hist_back= th
+history_back= H
+win_hist_forward= wl
+tab_hist_forward= tl
+history_forward= L
+insert_mode= i
+show_keys= Sk
+load_html= 
+load_html_tab= 
+lock_domain= xd
+lock_uri= xu
+tab_move_left= gl
+tab_move_right= gr
+tab_move= gm
 normal_mode=Control n
 open_editor=Control e
-quickmark=b
-tab_quickmark=B
-win_quickmark=wb
+quickmark= b
+tab_quickmark= B
+win_quickmark= wb
 start_page=Control h
-web_inspector=wi
-paste=pp
-tab_paste=Pp
-win_paste=wp
-paste_primary=pP
-win_paste_primary=wP
-tab_paste_primary=PP
+web_inspector= wi
+paste= pp
+tab_paste= Pp
+win_paste= wp
+paste_primary= pP
+win_paste_primary= wP
+tab_paste_primary= PP
 print=Control Mod1 p
 protect=Control P
 quit=Control q
-reload_bookmarks=
-reload=r
-reload_bypass_cache=R
-reload_quickmarks=
-reload_userscripts=
-save=sf
-save_session=ZZ
-save_named_session=gZZ
-save_quickmark=m
-scroll_down=j
-scroll_right=l
-scroll_left=h
+reload_bookmarks= 
+reload= r
+reload_bypass_cache= R
+reload_quickmarks= 
+reload_userscripts= 
+save= sf
+save_session= ZZ
+save_named_session= gZZ
+save_quickmark= m
+scroll_down= j
+scroll_right= l
+scroll_left= h
 scroll_page_down=Control f
 scroll_page_up=Control b
 scroll_halfpage_down=Control d
 scroll_halfpage_up=Control u
-scroll_bottom=G
-scroll_top=gg
-scroll_up=k
-local_set=
-set=
-set_key=sk
-set_local_setting=sl
-set_setting=ss
-show_settings=Ss
-print_preview=
-show_bookmarks=Sb
-show_downloads=Sd
-show_history=Sh
-show_quickmarks=Sq
+scroll_bottom= G
+scroll_top= gg
+scroll_up= k
+local_set= 
+set= 
+set_key= sk
+set_local_setting= sl
+set_setting= ss
+show_settings= Ss
+print_preview= 
+show_bookmarks= Sb
+show_downloads= Sd
+show_history= Sh
+show_quickmarks= Sq
 stop_loading=Control s
-toggle_local_setting=
-toggle_setting=
+toggle_local_setting= 
+toggle_setting= 
 toggle_tab=Control @Tab@
-toggle_plugins_host_tmp=pth
-toggle_scripts_host=tsh
-toggle_scripts_host_tmp=tth
-toggle_scripts_uri=tsu
-toggle_plugins_uri_tmp=ptu
-toggle_scripts_uri_tmp=ttu
-fullscreen=@F11@
-toggle_hidden_files=g.
-toggle_plugins_host=ph
-toggle_plugins_uri=pu
-presentation_mode=@F12@
+toggle_plugins_host_tmp= pth
+toggle_scripts_host= tsh
+toggle_scripts_host_tmp= tth
+toggle_scripts_uri= tsu
+toggle_plugins_uri_tmp= ptu
+toggle_scripts_uri_tmp= ttu
+fullscreen= @F11@
+toggle_hidden_files= g.
+toggle_plugins_host= ph
+toggle_plugins_uri= pu
+presentation_mode= @F12@
 proxy=Control p
-visible=xv
-toggle_bars=xx
-toggle_statusbar=xb
-toggle_tabbar=xt
-undo=u
-view_source=gf
-dump=
-yank_title=yt
-yank_title_primary=yT
-yank=yy
-yank_primary=yY
-zoom==
-zoom_in=+
-zoom_out=-
-hints_background=;b
-hints_images_background=.i
-hints_url_background=.o
-backopen_url=xO
-backopen=xo
-bookmarks=gb
-hints=f
-hints_clipboard=;y
-hints_download=;d
-hints_editable=;e
-hints_images=;i
-hints_links=;;
-hints_primary=;Y
-hints_rapid=;r
-hints_url=;o
-new_tab=V
-new_win=W
-open_url=go
-open=o
-hints_tab=F
-hints_images_tab=;I
-hints_url_tab=;O
-tab_bookmarks=gB
-tabopen_url=gO
-tabopen=O
-hints_win=wf
-hints_rapid_win=;R
-win_bookmarks=wB
-winopen_url=wO
-winopen=wo
-adblock_reload_rules=
-visual_mode=v
-tabgrep=
-repeat=.
+visible= xv
+toggle_bars= xx
+toggle_statusbar= xb
+toggle_tabbar= xt
+undo= u
+view_source= gf
+dump= 
+yank_title= yt
+yank_title_primary= yT
+yank= yy
+yank_primary= yY
+zoom= =
+zoom_in= +
+zoom_out= -
+hints_background= ;b
+hints_images_background= .i
+hints_url_background= .o
+backopen_url= xO
+backopen= xo
+bookmarks= gb
+hints= f
+hints_clipboard= ;y
+hints_download= ;d
+hints_editable= ;e
+hints_images= ;i
+hints_links= ;;
+hints_primary= ;Y
+hints_rapid= ;r
+hints_url= ;o
+new_tab= V
+new_win= W
+open_url= go
+open= o
+hints_tab= F
+hints_images_tab= ;I
+hints_url_tab= ;O
+tab_bookmarks= gB
+tabopen_url= gO
+tabopen= O
+hints_win= wf
+hints_rapid_win= ;R
+win_bookmarks= wB
+winopen_url= wO
+winopen= wo
+adblock_reload_rules= 
+visual_mode= v
+tabgrep= 
+repeat= .
 entry_delete_active=Control d
-jump='
-mark=`
-hints_selector=
+jump= '
+mark= `
+hints_selector= 
 
 reload_searchengines=
 restart=
index b1edc364428ef4611994ab32a77ada78a5cb6853..dcea6b0ed65f5321962188185e8af31b1795b1f9 100644 (file)
@@ -110,6 +110,7 @@ domains : {
     "github.com" :         { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/github.com.css" },
     "humblebundle.com" :   { "user-stylesheet-uri" : "" },
     "imgur.com" :          { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/imgur.com.css" },
+    "paradoxplaza.com":    { "user-stylesheet-uri" : "" },
     "reddit.com" :         { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/reddit.com.css" },
     "soundcloud.com" :     { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/soundcloud.com.css" },
     "stackexchange.com" :  { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/stackoverflow.com.css" },
@@ -119,10 +120,11 @@ domains : {
     "superuser.com" :      { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/stackoverflow.com.css" },
     "tardis" :             { "user-stylesheet-uri" : "" },
     "tardis.uni.cx" :      { "user-stylesheet-uri" : "" },
-    "trakt.tv" :           { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/trakt.tv.css" },
     "thetvdb.com" :        { "user-stylesheet-uri" : "" },
+    "trakt.tv" :           { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/trakt.tv.css" },
     "usenet-crawler.com" : { "user-stylesheet-uri" : "" },
     "wikipedia.org" :      { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/wikipedia.org.css" },
+    "xkcd.com" :           { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/xkcd.com.css" },
 },
 //Settings applied based on the hostname
 hosts : {
@@ -130,6 +132,7 @@ hosts : {
     "docs.pointclouds.org" :     { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/doxygen.css" },
     "docs.ros.org" :             { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/doxygen.css" },
     "git.rmz.io" :               { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/gitweb.css" },
+    "git.chakraos.org" :         { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/gitweb.css" },
     "maps.google.com" :          { "user-stylesheet-uri" : "" },
     "paste.chakraos.org" :       { "user-stylesheet-uri" : "file:///home/ramsi/.config/dwb/userstyles/paste.chakra-project.org.css" },
     "plus.google.com" :          { "user-stylesheet-uri" : "" },
index 0acc00cbda3a3dbc86035b0b6d16c935fa791be0..f44fc6b7c1f43f5ed692ab166f524950013b4533 100644 (file)
@@ -1,4 +1,4 @@
-/*! Github Dark Theme v1.12.0 (3/26/2015) *//*
+/*! Github Dark Theme v1.13.1 (5/21/2015) *//*
  * https://github.com/StylishThemes/GitHub-Dark
  * http://userstyles.org/styles/37035
  * License: http://sam.zoy.org/wtfpl/
@@ -9,8 +9,8 @@
     background-image: /*[[bg-choice]]*/ url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkAgMAAAANjH3HAAAACVBMVEUaGhohISElJSUh9lebAAAB20lEQVRIx4XWuZXDMAwE0C0SAQtggIIYoAAEU+aKOHhYojTrYP2+QfOW/5QIJOih/q8HwF/pb3EX+UPIveYcQGgEHiu9hI+ihEc5Jz5KBIlRRRaJ1JtoSAl5Hw96hLB1/up1tnIXOck5jZQy+3iU2hAOKSH1JvwxHsp+5TLF5MOl1/MQXsVs1miXc+KDbYydyMeUgpPQreZ7fWidbNhkXNJSeAhc6qHmHD8AYovunYyEACWEbyIhNeB9fRrH3hFi0bGPLuEW7xCNaohw1vAlS805nfsrTspclB/hVdoqusg53eH7FWot+wjYpOViX8KbFFKTwlnzvj65P9H/vD0/hibYBGhPwlPO8TmxRsaxsNnrUmUXpNhirlJMPr6Hqq9k5Xn/8iYQHYIuQsWFC6Z87IOxLxHphSY4SpuiU87xJnJr5axfeRd+lnMExXpEWPpuZ1v7qZdNBOjiHzDREHX5fs5Zz9p6X0vVKbKKchlSl5rv+3p//FJ/PYvoKryI8vs+2G9lzRmnEKkh+BU8yDk515jDj/HAswu7CCz6U/Mxb/PnC9N41ndpU4hUU7JGk/C9PmP/M2xZYdvBW2PObyf1IUiIzoHmHW9yTncliYs9A9tVNppdShfgQaTLMf+j3X723tLeHgAAAABJRU5ErkJggg==) !important;
     background-clip: border-box !important;
     background-origin: padding-box !important;
+    background-attachment: /*[[bg-attachment]]*/ fixed !important;
     /*[[bg-options]]*/
-    /*[[bg-options2]]*/
   }
   /* custom code font */
   pre, code, tt, kbd:not(.badmono), pre, samp, .blob-code, .file-data pre, .line-data, #gist-form .file .input textarea,
   .discussion-sidebar-toggle:hover .octicon, .sidebar-assignee .assignee:hover, .timeline-commits .commit-message a:hover,
   .timeline-commits .commit-id:hover, #markdown-toc li a:hover, .sidebar-module ul ul li a:hover, .btn.btn-outline,
   .org-teams-list .team:hover .team-name, .gh-header-back:hover span:before, a.lock-toggle-link:hover,
-  a.tabnav-extra:hover, .org-header .edit-org:hover .octicon,
-  .diagram-icon-small:not(.active) .mega-octicon:before, .diagram-icon:not(.active) .mega-octicon:before,
-  .panel-nav:not(.disabled) .mega-octicon:before, .team-info-card .stats-group .stat:hover,
-  .team-info-card .stats-group .stat:hover .stat-number, .octicon-btn:hover, a.discussion-item-entity:hover,
-  span.discussion-item-entity:hover, .issues-listing .table-list-issues .issue-comments-link:hover,
+  .org-header .edit-org:hover .octicon, .diagram-icon-small:not(.active) .mega-octicon:before,
+  .diagram-icon:not(.active) .mega-octicon:before, .panel-nav:not(.disabled) .mega-octicon:before,
+  .team-info-card .stats-group .stat:hover, .team-info-card .stats-group .stat:hover .stat-number, .octicon-btn:hover,
+  a.discussion-item-entity:hover, span.discussion-item-entity:hover, .issues-listing .table-list-issues .issue-comments-link:hover,
   .issues-listing .table-list-issues .issue-title-link:hover, .issues-listing .table-list-issues .issue-meta-section a:hover,
   .issues-reset-query:hover, .issues-listing .table-list-issues .milestone-link:hover .octicon, .labels-list-action:hover,
-  .commits-list-item .commits-comments-link:hover, .discussion-item-ref-title .title-link:hover, .box-action:hover, .box-action:active,
-  input[type="text"]:focus+.scope-badge, .repo-list-stats .repo-list-stat-item:hover, .octotree_views .octotree_treeview .jstree-anchor,
-  .jstree-icon.tree::before, .octicon-file-directory, .branch-status-details, .notification-actions .btn-link:hover,
-  a.discussion-item-toggle-open:hover, a.discussion-item-toggle-closed:hover,
-  .task-list a, .full-commit .btn.btn-outline:hover, .zeroclipboard-link, .stats-group-stat:hover,
-  .stats-group-stat:hover .stat-number, a.commit-link, .tag-references > li a:hover, .two-factor-toggle .two-factor-status button,
-  .homepage .mega-octicon:before, .tree-browser tr.navigation-focus .octicon-chevron-right, #header ul.top-nav > li > a:hover,
-  #header ul.top-nav > li > button:hover, .new-file-form, .date_selector td, .pagination a, .pagination span,
-  .pagination em {
+  .commits-list-item .commits-comments-link:hover, .discussion-item-ref-title .title-link:hover, .box-action:hover,
+  .box-action:active, input[type="text"]:focus+.scope-badge, .repo-list-stats .repo-list-stat-item:hover,
+  .octotree_views .octotree_treeview .jstree-anchor, .jstree-icon.tree::before, .octicon-file-directory,
+  .branch-status-details, .notification-actions .btn-link:hover, a.discussion-item-toggle-open:hover,
+  a.discussion-item-toggle-closed:hover, .task-list a, .full-commit .btn.btn-outline:hover, .zeroclipboard-link,
+  .stats-group-stat:hover, .stats-group-stat:hover .stat-number, .tag-references > li a:hover,
+  .two-factor-toggle .two-factor-status button, .homepage .mega-octicon:before,
+  .tree-browser tr.navigation-focus .octicon-chevron-right, #header ul.top-nav > li > a:hover,
+  #header ul.top-nav > li > button:hover, .new-file-form, .date_selector td, .pagination a, .pagination span, .pagination em,
+  .timeline-comment-actions .octicon:hover, a.org-link:hover, a.commit-link, a.commit-link tt, .team-grid .team-name:focus,
+  .team-grid .team-name:hover, a.tabnav-extra:hover, .tabnav .tabnav-extras:hover,
+  .application-authorizations .oauth-app-owner:hover {
     color: /*[[base-color]]*/ #4183C4 !important;
   }
   /* Base color panel */
   .example-nav li a.selected, .typeahead-result.navigation-focus, .typeahead-result:hover,
   .add-line-comment, .issues-reset-query:hover .octicon-x, .segmented-nav li.active, .diff-expander:hover,
   .pagination .current, .owner-select-target:hover, .btn.btn-outline:hover, .filter-item.selected,
-  .release-timeline-tags .expander-text:hover .expander-dots, a.gollum-minibutton:hover, a.gollum-minibutton:visited:hover {
+  .release-timeline-tags .expander-text:hover .expander-dots, a.gollum-minibutton:hover, a.gollum-minibutton:visited:hover,
+  .search-result-item.navigation-focus {
     background: /*[[base-color]]*/ #4183C4 !important;
   }
   .context-button:after {
     border-color: /*[[base-color]]*/ #4183C4 transparent transparent !important;
   }
   .octofication .message, .panel-nav:not(.disabled):active, .diagram-icon:not(.active), .full-commit .btn.btn-outline:hover,
-  .btn.btn-outline:hover, .btn.btn-outline.zeroclipboard-is-hover {
+  .btn.btn-outline:hover, .btn.btn-outline.zeroclipboard-is-hover, :checked + .radio-label {
     border-color: /*[[base-color]]*/ #4183C4 !important;
   }
   .header-nav-link:hover .dropdown-caret, .header-nav-link:focus .dropdown-caret {
     border-top-color: /*[[base-color]]*/ #4183C4 !important;
   }
+  .table-list .table-list-item.unread .table-list-cell-checkbox {
+    border-left-color: /*[[base-color]]*/ #4183C4 !important;
+    box-shadow: 2px 0px 0px /*[[base-color]]*/ #4183C4 inset !important;
+  }
   /* === Notification icon === */
   .notification-indicator .mail-status {
     background-color: /*[[base-color]]*/ #4183C4 !important;
     color: #444 !important;
     opacity: 1 !important;
   }
-  /* checked & unread issue indicator */
-  .table-list-item.unread .table-list-cell-checkbox {
-    box-shadow: 2px 0 0 #fff inset !important;
-  }
   /* input focus hightlight */
-  input.focus[type="text"], #adv_code_search .focus.search-page-label,
-  input[type="text"]:focus:not(.js-color-editor-input):not(.tree-finder-input),
+  input.focus[type="text"], #adv_code_search .focus.search-page-label, .js-chromeless-input-container.focus,
+  input[type="text"]:focus:not(.js-color-editor-input):not(.tree-finder-input):not(.js-site-search-focus),
   .focused .drag-and-drop, #adv_code_search .search-page-label:focus, input.focus[type="password"],
   input[type="password"]:focus, input.focus[type="email"], input[type="email"]:focus, input.focus[type="number"],
   input[type="number"]:focus, input.focus[type="tel"], input[type="tel"]:focus, input.focus[type="url"],
-  input[type="url"]:focus, textarea.focus, textarea:focus, #q:focus ~ button {
+  input[type="url"]:focus, textarea.focus, textarea:focus, #q:focus ~ button, input.color-editor-input:focus {
     border-color: /*[[base-color]]*/ #4183C4 !important;
     box-shadow: inset 0 1px 2px rgba(0,0,0,0.075), 0 0 2px /*[[base-color]]*/ #4183C4 !important;
   }
   select, input:not(.js-color-editor-input), textarea {
     -moz-appearance: none !important;
     background: #181818 !important;
-    border: 1px solid #444 !important;
+    border: 1px solid #343434 !important;
     color: #eee !important;
   }
   /* custom checkbox and radio styles. We need a full set of styles here as WebKit removes all of them when
          tab-size: /*[[tab-size]]*/ 4 !important;
     -moz-tab-size: /*[[tab-size]]*/ 4 !important;
   }
+
+  .repository-sidebar, .blog-aside, .gist-sidebar {
+    position: sticky !important;
+    top: 8px !important;
+    z-index: 1 !important;
+  }
+
   /* HACK: Label colors */
-  a.label[href*="/issues?"][style*=" color: #f"], a.label[href*="/pulls?"][style*=" color: #f"] { color: #fff !important }
-  a.label[href*="/issues?"][style*=" color: #e"], a.label[href*="/pulls?"][style*=" color: #e"] { color: #eee !important }
-  a.label[href*="/issues?"][style*=" color: #d"], a.label[href*="/pulls?"][style*=" color: #d"] { color: #ddd !important }
-  a.label[href*="/issues?"][style*=" color: #c"], a.label[href*="/pulls?"][style*=" color: #c"] { color: #ccc !important }
-  a.label[href*="/issues?"][style*=" color: #3"], a.label[href*="/pulls?"][style*=" color: #3"] { color: #333 !important }
-  a.label[href*="/issues?"][style*=" color: #2"], a.label[href*="/pulls?"][style*=" color: #2"] { color: #222 !important }
-  a.label[href*="/issues?"][style*=" color: #1"], a.label[href*="/pulls?"][style*=" color: #1"] { color: #111 !important }
-  a.label[href*="/issues?"][style*=" color: #0"], a.label[href*="/pulls?"][style*=" color: #0"] { color: #000 !important }
+  a.label[href*="/issues?"][style*=" color: #f"], a.label[href*="/pulls?"][style*=" color: #f"] { color: #e8e8e8 !important }
+  a.label[href*="/issues?"][style*=" color: #e"], a.label[href*="/pulls?"][style*=" color: #e"] { color: #e8e8e8 !important }
+  a.label[href*="/issues?"][style*=" color: #d"], a.label[href*="/pulls?"][style*=" color: #d"] { color: #e8e8e8 !important }
+  a.label[href*="/issues?"][style*=" color: #c"], a.label[href*="/pulls?"][style*=" color: #c"] { color: #e8e8e8 !important }
+  a.label[href*="/issues?"][style*=" color: #3"], a.label[href*="/pulls?"][style*=" color: #3"] { color: #181818 !important }
+  a.label[href*="/issues?"][style*=" color: #2"], a.label[href*="/pulls?"][style*=" color: #2"] { color: #181818 !important }
+  a.label[href*="/issues?"][style*=" color: #1"], a.label[href*="/pulls?"][style*=" color: #1"] { color: #181818 !important }
+  a.label[href*="/issues?"][style*=" color: #0"], a.label[href*="/pulls?"][style*=" color: #0"] { color: #181818 !important }
   /* HACK: Center emoji vertically on the line */
   .emoji {
     position: relative;
   }
   /* HACK: Fix annoying text selection bug in Firefox */
   .markdown-body code, .markdown-body tt {
-    padding: 0 .2em !important;
+    padding: 0 .3em !important;
     display: inline-block !important;
-    border: 1px solid #383838 !important;
   }
  .markdown-body pre code, .markdown-body pre tt {
     padding: .2em 0 !important;
     border: none !important;
   }
   .markdown-body code::before, .markdown-body code::after, .markdown-body tt::before, .markdown-body tt::after {
-    content: "" !important;
+    display: none !important;
   }
   .markdown-body pre code::before, .markdown-body pre code::after, .markdown-body pre tt::before, .markdown-body pre tt::after {
     display: none !important;
   .merge-pr-more-commits {
     padding: 2px 5px !important;
   }
-  input.tree-finder-input, input.tree-finder-input:focus {
+  input.tree-finder-input, input.tree-finder-input:focus, input.js-site-search-focus {
     background: transparent !important;
     border: none !important;
     box-shadow: none !important;
   }
+  .markdown-body a:not([href]), .markdown-body a code {
+      color: inherit !important;
+      text-decoration: none !important;
+  }
+  .markdown-body strike code, .markdown-body strike tt {
+    text-decoration: line-through !important
+  }
+
   /* === Remove shadow === */
   h1, h2, h3, h4, pre, pre *, code, tt, li, p, input, a, th, kbd, .news, #footer ul.sosueme li.main, .more-repos, .btn,
   .metabox em.placeholder, table.notifications, #download_button, .comment-count, em.date, input.search, #user-links,
   .avatar-stack.multiple-avatars .avatar:last-child, .avatar-stack.multiple-avatars:before,
   .box-action, .file-diff-line, .file-code-lines, #adv_code_search .search-page-input, li.ssh-key .ssh-key-state-indicator.not-recent,
   #gist-form .gist-name-textbox, .labels .label, .octotree_views .octotree_view .octotree_view_header,
-  .fullscreen-overlay textarea, .avatar-child, .discussion-item .label-color {
+  .fullscreen-overlay textarea, .avatar-child, .discussion-item .label-color, .coupons .coupon-form-body {
     text-shadow: none !important;
     box-shadow: none !important;
   }
   .minibutton span, span.name, .diff-line-code, .num, .user-list em, .diff-expander .octicon-unfold:hover,
   .select-menu-loading-overlay:before, .select-menu-item a, .minibutton, .mini-icon, .mini-icon:before, .list-tip:before,
   .line-num-content, .diff-expander .octicon-unfold, .minibutton i, .comment-header-author, .header, .gist .gist-file .gist-meta,
-  .logo-placeholder, .branch-group-heading, .render-bar, .auth-form-header .octicon {
+  .logo-placeholder, .branch-group-heading, .render-bar, .auth-form-header .octicon, .render-info .symbol {
     text-shadow: none !important;
   }
   /* === transparent background only === */
   .gist-advanced-options .select-menu-button:after, #wrapper, li.commit, li.public, .gravatar img,
   .commit-comments-header-sha, pre.headers code, .audit-search-form,
   .columns.equacols.bordered, .gist-item ul.meta>li>a:hover, .commits li img, a.minibutton code, .milestone, .more-repos,
-  .previewable-comment-form, .keyboard-mappings th, .api #header-wrapper .nav,
+  .keyboard-mappings th, .api #header-wrapper .nav,
   .marketing-nav a.selected, #graph_data .tabs, .org-nav-item.selected, .edit-team-member:hover, tr.commit,
   .release-timeline .js-details-container, .section-heading-title a.js-selected-navigation-item, .featured-callout .screenshot,
   .sidebar-module h3 a:hover, .timeline-commits .commit-meta .status, .theme-picker-spinner,
   .diagram-icon-small, .commits-listing .commit-group-title .octicon-git-commit, #readme .highlight,
   .ace-github, .add-member-team-list.table-list, .theme-picker, .avatar-stack .avatar, .boxed-group, .full-commit .btn.btn-outline,
   .prose-diff > .markdown-body ins, .header .divider-vertical, .ace-github-base16, .markdown-body pre code, .markdown-body pre tt,
-  #readme .plain pre, .uploaded-files, .merge-pr-more-commits code, .two-factor-toggle .two-factor-status button {
+  #readme .plain pre, .uploaded-files, .merge-pr-more-commits code, .two-factor-toggle .two-factor-status button, .input_area,
+  #notebook .highlight, #notebook .highlight pre, .output_area pre {
     background: transparent !important;
   }
   .render-container.is-render-ready.is-render-requested:not(.is-render-failed) {
     background: none !important;
   }
-  /* Redeem Page */
-  .coupons .coupon-form-body {
-    background-image: none !important;
-    background-color: #222 !important;
-    box-shadow: none !important;
-    border: 1px solid #666 !important;
-  }
   /* === Remove background gradient === */
   #directory .repo, #dashboard .repo, #categories li, .sosueme li.main, #commit .separator, .big-notice, .clean td,
   .legend .clean, .avatar .overlay.size-48, .listing.closed, .gist .gist-file .gist-data, .gist-syntax,
   .wiki-wrapper .wiki-empty-box:hover {
     border-color: #777 !important;
   }
-  pre, hr, img, #browser table, #browser table th, #issues .menu ul li, .branches .more-branches,
+  img, #browser table, #browser table th, #issues .menu ul li, .branches .more-branches,
   .counter, .issues td, ul.main_nav li.selected, .browser_header, .issue-head, .bootcamp-help .image, ul.hook-list,
   .clone-url-button, .list-tip li, .section-nav a, .search-menu-container,
   .repo_list li a, .graphs .axis, .switcher > span:after, a.assignee-bit, .menu li, .notifications td, .filter-tab,
   .content-header, .user-list-item, .markdown-body, ul#categories li h5, .render-view-modes li,
   .gobutton.with-comments .sha, #gollum-editor-function-bar, .capped-box, .steps li, #common-issues,
   .steps, #graphs, .previewable-comment-form .comment, .org-module, .org-repo, .table-list,
-  .table-list-cell, .org-add-footer, .auto-search-group .search-filter, #notification-center li, .branch-status,
+  .org-add-footer, .auto-search-group .search-filter, #notification-center li, .branch-status,
   .commit-tease .commit-meta, .comment + .comment, .discussion-bubble-inner, .member-row, .press-info,
   .timeline-comment, .timeline-comment-header, .timeline-commits .timeline-commits-header,
   .marketing-section, .featured-callout .screenshot, .page-new-repo .license-container,
   .orgs-help-shelf-content .orgs-help-divider, .repository-lang-stats-graph {
     border-color: #484848 !important;
   }
-  h1, h2, h3, .header, #footer, .pagehead, table, table tr, table td, table th, blockquote, .pulse-graph,
+  pre, h1, h2, h3, .header, #footer, .pagehead, table, table tr, table td, table th, blockquote, .pulse-graph,
   .btn:not(img), .minibutton, .social-count, .discusion-topic-infobar, .box-header, .box-body, .timeline-comment-label, .logo-box,
   .suggester li, .developer-program-badge, .vcard-details, .vcard-stats, .auth-form-header, .nav-bar-tabs .section-title,
   .pagination a:last-child, .pagination span:first-child, .boxed-group-list > li, .toolbar-bordered, .new-issue-form,
-  .pagination span:last-child, .dashboard-tabs, .graphs, .graph, .featured-callout .rule, .sub-nav, .audit-search-clear,
+  .pagination span:last-child, .dashboard-tabs, .graphs, .graph, .sub-nav, .audit-search-clear,
   ul.sunken-menu-group a.selected, .repo-list-item, .email-signature-reply, footer, .bubble .bubble-expand,
   .grid .col, .composer-infobar, .email-quoted-reply, .summary-stats li, .columns.equacols.bordered,
   .file-diffstat, ul.filter-list, .news .alert, table.files td, .explore-section, .repolist > li, .featured-grid-outer,
   .table-list-bordered .table-list-cell:first-child, .table-list-bordered .table-list-cell:last-child, .table-list-cell,
   .table-list, .table-list-header, .blankslate, .labels-list-item, .subnav-divider-right, .subnav-bordered,
   .content table tr th, #search-results li, .subhead, #pages-composer, .render-bar, #gollum-editor-help,
-  #gollum-editor-help-parent, #gollum-editor-help-list, .markdown-format code, .auth-section, .commit-sha,
+  #gollum-editor-help-parent, #gollum-editor-help-list, .auth-section, .commit-sha,
   .comment-body, .mini-repo-list-item, .advanced-search-form fieldset, .contrib-column, .org-header .edit-org,
   .pulse-summary .summary-box, .pulse-summary .summary-box li:first-child, .list-item + .list-item, .list-item + .list-heading,
   .list-heading + .list-item, .issue-list-item, .ace_gutter, .collection-card, .setup-header, body.api pre,
   .stats-group-stat:first-child, .build-statuses-list, #gollum-dialog-dialog-buttons, #gollum-dialog-dialog h4,
   a.gollum-minibutton, a.gollum-minibutton:visited, .two-factor-toggle .two-factor-status, .two-factor-settings-group,
   .member-badge, ul.comparison-list > li, .markdown-format ol > li::before, .release-downloads, .release-downloads li,
-  .blob-interaction-bar, .file-header, input.subnav-search-input, .select-menu-header,
+  .blob-interaction-bar, .file-header, input.subnav-search-input, .select-menu-header, .search-results,
   .select-menu-text-filter:first-child:last-child, .select-menu-modal, #gist-form .file .meta, .file .meta,
-  .file-box .meta, .capped-card, .audit-results-header, .pagination a, .pagination span, .pagination em {
+  .file-box .meta, .capped-card, .audit-results-header, .pagination a, .pagination span, .pagination em,
+  .input_area, .output_area .rendered_html table, .render-info .message, .dashboard-notice, .radio-label {
     border-color: #343434 !important;
   }
   .discussion-item-icon, .date:after, .render-shell img, img.asset, ul.color-label-list .color {
   .discussion-timeline:before {
     margin-top: 2px !important;
     background: #444 !important;
-    height: calc(100% - 260px) !important;
+    height: calc(100% - 387px) !important;
   }
   .listings div.listing {
     border-left: 2px solid #333 !important;
     border-left: 1px solid #333 !important;
     border-right: 1px solid #333 !important;
   }
-  .timeline-comment:after {
+  .timeline-comment:after, .commit-form:after {
     border-right-color: #1d1d1d !important;
   }
-  .branch-action-body:after, .timeline-comment-wrapper > .timeline-comment::after,
-  .timeline-new-comment .timeline-comment::after {
+  .branch-action-body:after, .timeline-comment-wrapper > .timeline-comment:after,
+  .timeline-new-comment .timeline-comment:after {
     border-right-color: #181818 !important;
   }
   .timeline-comment:before, .branch-action-body:before {
   .native-download, .setup-info-module, div#common-issues ul, #gist-form .name, .subnav-item, .render-notice,
   .simple-box, .label-edit.edit-color-label-form .color-editor .color-editor-input, .date_selector td,
   .new-label, .range-editor .range, .range-editor .flag, .octotree_sidebar, .auth-form-body, div.border-wrap,
-  .profile-header, .btn.btn-outline, .comment-form-head.tabnav, .highlight .gc, .uploaded-files.is-populated, .range-editor,
+  .profile-header, .btn.btn-outline, .highlight .gc, .uploaded-files.is-populated, .range-editor,
   #gollum-editor-help-parent li a.selected, #gollum-editor-help-list li a.selected, #gollum-editor-help-parent li a:hover,
   #gollum-editor-help-list li a:hover, .github-access-banner, .protip-callout, ul.comparison-list, .wiki-custom-sidebar,
-  .invitation-container, .orgs-help-shelf, .orgs-help-item-octicon {
+  .invitation-container, .orgs-help-shelf, .orgs-help-item-octicon, .form-control, input[type="text"]:not(.tree-finder-input),
+  input[type="password"], input[type="email"], input[type="number"], input[type="tel"], input[type="url"], textarea, .two-factor-help {
     background: #181818 !important;
     border-color: #343434 !important;
   }
   #readme .plain, .readme .markdown-body, .readme .plain, .pull-request-composer, .drag-and-drop,
-  .octofication .broadcast-icon-mask, .file .image, .merge-pr-more-commits, .release-timeline-tags .expander-dots {
+  .octofication .broadcast-icon-mask, .file .image, .merge-pr-more-commits, .release-timeline-tags .expander-dots,
+  .coupons .coupon-form-body {
     background: #181818 !important;
     border-color: #484848 !important;
   }
   .render-shell, .list, .latest-commit .commit-author, .bubble, .tabs > a.selected, .pagination .gap, .pagination .disabled,
   .pagination .gap:hover, .pagination .disabled:hover, .comment-form-head .tabnav-tab.selected,
   .table-list, .oauth-org-access-details .boxed-group-list > li.on, #fullscreen_overlay,
-  .timeline-new-comment .discussion-topic-header, .branch-action-body {
+  .timeline-new-comment .discussion-topic-header, .branch-action-body, .inline-comment-form {
     background: #181818 !important;
   }
   .markdown-body table tr {
   /* headers */
   .table-list-header, .timeline-comment-header, .boxed-group > h3, .boxed-group .heading, .file-header, .capped-card h3,
   .select-menu-header, #gist-form .file .meta, .file .meta, .file-box .meta, .menu-heading,
-  .audit-results-header, .branches .branch-group-heading, .auth-form-header {
+  .audit-results-header, .branches .branch-group-heading, .auth-form-header, .commit-form,
+  .comment-form-head.tabnav, .dashboard-notice {
     background: #1d1d1d !important;
   }
   /* Navigation focus */
   .subnav-item:hover, .subnav-item:focus, .tree-browser tr.navigation-focus td, .issues-listing .table-list-issues .selectable:hover,
   .issues-listing .table-list-issues .navigation-focus, .setup-plans tr.selected, .notifications .navigation-focus,
   .sidebar-module ul ul li a:hover, .typeahead-result, .no-results, .link-overlay .link, #gollum-editor-help-list,
-  .owner-select-target, .divider .blob-code div.highlight,  pre div[style^="background-color: rgb(248, 238, 199)"],
+  .owner-select-target, .divider .blob-code div.highlight, pre div[style^="background-color: rgb(248, 238, 199)"],
   .highlight td[style^="background-color: rgb(248, 238, 199)"], .line[style^="background-color: rgb(255, 255, 204)"],
   .oauth-org-access-details .boxed-group-list > li.on:hover, pre div:hover, .diff-table tr:hover > pre,
   .highlight:not(.lines) tr:not(.inline-comments):hover td:not(.line-age) {
-    background: #202020 !important;
+    background: #242424 !important;
   }
-  /* === #222 === */
   #main, .capped-box, .unread_count, #browser table th, .markdown-format table th, .session-device, .profilecols ul.stats li strong,
   table.upgrades tr.current td, .definitions, .commit-tease .commit-meta, .discussion-topic-header, .facebox-popup,
   .timeline-commits-minimal .commit-icon .octicon, .timeline-commits .commit-icon .octicon, .upload-progress, .search-results-listing em,
   .repository-sidebar a.js-selected-navigation-item.selected, .discussion-bubble-inner,  #wiki-history table td,
-  .commit.file-history-tease, .menu a.selected, .gist .gist-file .gist-data, #message.major, .logo-box, .commit-form,
+  .commit.file-history-tease, .menu a.selected, .gist .gist-file .gist-data, #message.major, .logo-box,
   .markdown-example .rendered, .team-grid .team-members, .diagram-icon:not(.active), table.capped-list th, .scope-badge, .filter-bar,
   .audit-search-clear, .country-info, .tabnav-tab.selected, .file-diff-split .empty-cell, .composer-infobar {
     background: #222 !important;
   }
-  #browser, .repos, .options-group, .pagehead ul.tabs li a.selected, .subnav-bar, .options-content, span.gravatar, .browsered,
+  hr, .rule, #browser, .repos, .options-group, .pagehead ul.tabs li a.selected, .subnav-bar, .options-content, span.gravatar, .browsered,
   .browsered .inner, .subnav-bar > ul > li > ul, .comment-form ul.tabs a.selected, .issue.open.read .summary, .unselected_month,
   .commits th, #MathJax_Message, #header .userbox, .chzn-single, .user-commits, .user-commits th, .metabox, .ranked-repositories > li,
   .pagehead ul.actions, #issues_search .comment, #header-wrapper,  ul.feature-tabs li.highlight, .pagination, .filterbar .filters li,
   .starting-comment .body, .list-tip, .commit_oneline, .filterbox, .conversation-list-heading .inner, .autocomplete-results,
   .new-comments .body, .display tr, .render-container, .sunken-menu-item.selected, .boxed-group-table th, .features-highlight,
   .outline-box-highlighted, .nav-bar-tabs, #watchers li, .browser .listing, .item, .context-pane, .context-loader, .sidebar .module,
-  .tip-body, #assignee, .rule, .sidebar-module > ul, .commit_oneline td, #footer-push, .notifications th, .content table th,
+  .tip-body, #assignee, .sidebar-module > ul, .commit_oneline td, #footer-push, .notifications th, .content table th,
   .repo-collection>ul, #graph_data .tab.selected, .full-width-divider, .markdown-body .csv-data th,
   h3.conversation-list-heading strong, .file-commit-form .commit-form, .thread-subscription-status, .blog-feedback, .facebox-footer,
   .invited-banner, .build-status-item {
   }
   .btn:disabled, .btn:disabled:hover, .btn.disabled, .btn.disabled:hover, button.button:disabled, button.button:disabled:hover,
   button.button.disabled, button.button.disabled:hover, button.minibutton:disabled, button.minibutton:disabled:hover,
-  button.minibutton.disabled, button.minibutton.disabled:hover, a.minibutton:disabled:hover, a.minibutton.disabled:hover {
+  button.minibutton.disabled, span.minibutton.disabled, a.minibutton.disabled, button.minibutton.disabled:hover,
+  a.minibutton:disabled:hover, a.minibutton.disabled:hover, span.minibutton:disabled:hover, span.minibutton.disabled:hover,
+  .search-result-group {
     background: #222 !important;
     border-color: #282828 !important;
     color: #444 !important;
   }
-  /* inline code */
-  .list-browser-item.closed, .content .verseblock-content, .content .verseblock-content, .commit-preview .message pre,
-  .content dl code, .content ul code, p code, body.blog pre > code, .content .sectionbody .dlist dt, .content p > tt,
-  .content .sectionbody .dlist dt, .content p > tt, .commit-sha, .markdown-body code, .markdown-body tt, .protip code,
+
+  .list-browser-item.closed, .content .verseblock-content, .content .verseblock-content,
   .simple-stacked-bar, .rss-subscribe:hover, div#common-issues ul li a:hover, .date_selector td.selectable_day:hover,
   .date_selector td.selectable_day.hover, .pagination a:hover, .pagination a:focus, .pagination span:hover,
   .pagination span:focus, .pagination em:hover, .pagination em:focus {
   .pagehead ul.tabs li a:hover, .repos .bottom-bar, #languages .popular, .tip-box h4, table.upgrades td,
   .commit-preview .message, .commit-preview p.error, .pagehead ul.tabs li.contextswitch, #browser tr th, .status-box h4,
   .line_numbers, #files span.icon, #issues_list .actions, #repos .public, .inset-callout, #repo-message,
-  .summary-stats li a:hover {
+  .summary-stats li a:hover, .repo-private-label, .label-admin, a.team-member-ellipsis {
     background: #333 !important;
   }
-  .metabox .rule, .comment-form, #issues .labels, #gollum-editor select, .listings .odd, .feed, #files .description,
+  .comment-form, #issues .labels, #gollum-editor select, .listings .odd, .feed, #files .description,
   #message .envelope .header .info .title.unread, li.contextswitch ul li.current, .watcher-widget,
   ul.main_nav li.selected a, ul.states li, .add_file, .inset, li.label, .filterbar, .divider-vertical,
   #footer .upper_footer, .user-commits td, .starting-comment .infobar, #issues_next .infobar, .formbody,
   iframe[src*="polldaddy.com"], .jstree-icon.jstree-ocl, .octotree_toggle .loader, .swipe .swipe-frame .swipe-bar .top-handle,
   .swipe .swipe-frame .swipe-bar .bottom-handle, .onion-skin .controls .transparent, .onion-skin .controls .opaque,
   .onion-skin .controls .slider .slider-track, .onion-skin .controls .slider .slider-track .dragger {
-    filter: url("data:image/svg+xml;utf8, <svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'i\'><feColorMatrix color-interpolation-filters=\'srgb\' values=\'-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0\'/></filter></svg>#i");
     -webkit-filter: invert(100%) !important;
+            filter: invert(100%) !important;
   }
   .emoji[title=":soon:"], .emoji[title=":on:"], .emoji[title=":end:"], .emoji[title=":heavy_dollar_sign:"], .emoji[title=":registered:"],
   .emoji[title=":tm:"], .emoji[title=":heavy_multiplication_x:"], .emoji[title=":heavy_plus_sign:"], .emoji[title=":heavy_minus_sign:"],
   .emoji[title=":heavy_division_sign:"], .emoji[title=":heavy_check_mark:"], .emoji[title=":arrows_clockwise:"],
   .emoji[title=":wavy_dash:"], .emoji[title=":curly_loop:"], .emoji[title=":copyright:"], .emoji[title=":currency_exchange:"],
   .emoji[title=":top:"], .emoji[title=":back:"] {
-    filter: url("data:image/svg+xml;utf8, <svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'i\'><feColorMatrix color-interpolation-filters=\'srgb\' values=\'-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0\'/></filter></svg>#i");
     -webkit-filter: invert(100%) !important;
+            filter: invert(100%) !important;
     background: transparent !important;
   }
+  /* match white to #181818 */
+  .output_area img {
+    -webkit-filter: invert(90%) !important;
+            filter: invert(90%) !important;
+  }
+  /* brighten language colors */
+  .language-color {
+    -webkit-filter: brightness(150%) !important;
+            filter: brightness(150%) !important;
+  }
   /* slightly darker */
   .more-repos-link {
     -webkit-filter: brightness(.666) !important;
   table.files tr.up-tree a:hover, .ellipsis-button:hover, .codesearch-results .repo-list-name em, .codesearch-results .repo-list-description em,
   .blog-search-results em, .codesearch-cols em, ul.bignav li a:hover, ul.smallnav li a:hover, .comments-wrapper, .rackspace,
   .subnav-bar > ul > li > ul > li > a:hover, ol.download-list li:nth-child(2n), .issue.active, .counter, .orgs-nav .count,
-  .filter-item:not(.selected):hover, .task-progress .progress-bar .progress, .markdown-body hr, .oauth-connection-illustration .oauth-image {
+  .filter-item:not(.selected):hover, .task-progress .progress-bar .progress, .oauth-connection-illustration .oauth-image {
     background: #444 !important;
   }
+  .markdown-body hr {
+    background: #383838 !important;
+  }
   .switcher > span:after, .list-module a:hover, .section-nav .active a, #dashboard .filter-bar li a.filter_selected:after {
     background-color: #555 !important;
   }
   .branch-a-b-count .meter, .branch-action-state-dirty .branch-action-icon, .branch-action-state-closed-dirty .branch-action-icon {
     background: #555 !important;
   }
-  .labels .label-neutral {
+  .labels .label-neutral, li.ssh-key .ssh-key-state-indicator.not-recent {
     background: #666 !important;
   }
   .diverge-widget .separator {
   .markdown-format .alert p, .blob-history {
     color: #8195BE !important;
   }
+
   .timeline-comment.current-user, .github-jobs-promotion p, .octotip, .markdown-format .alert:not(.warning),
   .full-commit.commit, .bootcamp .bootcamp-body, .bootcamp h1, .owners-notice, .new-user-avatar-cta, .full-commit .browse-button,
   .commit-ref, .full-commit .btn.btn-outline, a.branch-name, .branch-name,
   .commit-icon .octicon {
     border-radius: 100% !important;
   }
+  /* notebooks */
+  .input_prompt {
+    color: hsla(234, 100%, 65%, 1) !important;
+  }
+  .output_prompt {
+    color: hsla(0, 100%, 65%, 1) !important;
+  }
   /* === gradient === */
   /* light grey gradient */
   .btn:hover, .btn:active, .btn.zeroclipboard-is-hover, .btn.zeroclipboard-is-active, .minibutton:hover, .minibutton:active,
   .minibutton.zeroclipboard-is-hover, .minibutton.zeroclipboard-is-active.kbd, .signup-button:hover, a.signin:hover,
-  .hero .textographic, .hero .screenographic, .dashboard-notice, .pagination span.current, .box-action:active, .btn:active,
+  .hero .textographic, .hero .screenographic, .pagination span.current, .box-action:active, .btn:active,
   .btn.selected, .btn.selected:hover, .btn.zeroclipboard-is-active, .minibutton:active, .minibutton.selected,
   .minibutton.selected:hover, .minibutton.zeroclipboard-is-active, .clone-url-button.selected > a,
-  .clone-url-button.selected > a:hover, .octotree_toggle:hover, button.button:hover, button.minibutton:hover,
-  a.minibutton:hover {
+  .clone-url-button.selected > a:hover, .octotree_toggle:hover, button.button:hover, a.button:hover, span.button:hover,
+  button.minibutton:hover, a.minibutton:hover, span.minibutton:hover {
     background: linear-gradient(to bottom, #444, #333) !important;
     border-color: #484848 !important;
   }
   .pagehead ul.tabs li a, .login_form input[type="submit"], .top-bar, ul#bootcamp li a h4, .pull-info,
   #gists .context-menu-container, .branch-link, body#com #header, .white-nav .selected span, .clone-url-button a, .filter-tab,
   #header-wrapper, #header-wrapper .nav, .pagination span, .cheatsheet h2, .section a.section-head, .octotree_view_header,
-  .list-heading, .dashboard-tabs li a, a.function-button, .add-pill-form,
-  .gist .gist-file .gist-meta, .octotree_toggle, ul.comparison-list > li.title, button.button, button.minibutton, a.minibutton {
+  .list-heading, .dashboard-tabs li a, a.function-button, .add-pill-form, .gist .gist-file .gist-meta, .octotree_toggle,
+  ul.comparison-list > li.title, button.button, a.button, span.button, button.minibutton, a.minibutton,
+  span.minibutton {
     background: linear-gradient(to bottom, #282828, #181818) !important;
     border-color: #383838 !important;
   }
   .subnav li a:hover, .filters li.selected a, .filters li a:hover, .code-list em, a.header-anchor, .commandbar .choice .command,
   .search-term, .codesearch-cols em, .image, .selector-item:hover .mini-icon:before, .selector-item.selected .mini-icon:before,
   .new-repo .octicon, .select-menu-item.selected>.octicon, .sunken-menu a.selected .octicon, #header .nav a,
-  .feed-icon a .octicon, .release-label a, .minibutton i,
+  .feed-icon a .octicon, .release-label a, .minibutton i, .minibutton,
   .merge-status-icon .mega-octicon:before, .commit .mini-icon:before, .sidebar-milestone-widget .title,
   .select-menu-modal a.select-menu-item-text, .facebox-user-list-item a,
   .numbers-summary .num, #network .explain b,.sunken-menu-group li:hover .octicon, .featured-callout, h3 strong,
   .overall-summary .graphs .num, ul.summary-stats li .num, .pull-head-meta .pull-number a,
   .mini-discussion-bubble .mini-discussion-bubble-action, .sub-nav h2, .sub-nav h2 a, .boxed-group .boxed-group-inner strong,
   .accordion .section a.section-head, .commit-tease .authorship a, .orgs-nav .org-nav-item.selected, .sub-nav li a.active,
-  .pagehead .org-title .org-link, .gh-header-status .octicon:before, a.tabnav-tab.selected, .view-modes-menu li.active,
+  a.org-link, .gh-header-status .octicon:before, a.tabnav-tab.selected, .view-modes-menu li.active,
   span.discussion-item-icon, a.signin:hover, .marketing-benefits .mega-octicon:before,
   .thread-subscription-status .mega-octicon:before, .infobar-widget .text a, .dropdown-menu > li > a:hover > .octicon:before,
   .dropdown-menu > li > a.zeroclipboard-is-hover > .octicon:before, .highlight-module .mega-icon:before,
-  .headlines li a, .repository-sidebar .clone-options .octicon:before, .team:hover .team-name,
+  .headlines li a, .repository-sidebar .clone-options .octicon:before,
   #wiki-rightbar li, .i-am-error p, .select-menu-item-text, .markdown-body .octicon-link, .team-org-group strong,
   .gist-item ul.meta > li > a:hover, .native-download .mega-icon:before, #article-platform-nav ul li.selected a,
   .section-heading-title a.selected, .marketing-nav a.selected,
   #gollum-editor-help-parent li a.selected, #gollum-editor-help-list li a.selected, a.gollum-minibutton,
   a.gollum-minibutton:visited, a.token-warning, a.lightertooltipped, .org-team-sidebar .team-note .note-emphasis,
   .select-menu-tabs a.selected, #com .dropdown-menu a:hover, #com h1 span, #com h2 span, .breadcrumb strong.final-path,
-  button.button, button.minibutton, a.minibutton, .button.primary:hover, .pagination .current, .pagination .current:hover {
+  button.button, a.button, span.button, button.minibutton, a.minibutton, .button.primary:hover, .pagination .current,
+  .pagination .current:hover, .repo-private-label, a.repo_filter.js-repo-filter-tab.filter-selected, .keyboard-mappings th,
+  .rendered_html, .render-health:hover .symbol, .radio-label {
     color: #e0e0e0 !important;
   }
   pre, body, h3, h4, a.social-count, span.social-count, #languages a.bar, dl.form dt, .lineoption p, a.select-menu-button, a.blog-title,
   .select-menu-header .select-menu-title, #commits_tab_counter, .auto-search-group .search-filter, .usage-bar dt,
   .auto-search-group .search-filter .octicon:before, .github-jobs-promotion p a,
   .select-menu-item .description, .issue-head .number strong, .file-info .file-name, .explain strong, .file-box .meta,
-  .form-checkbox .note, .commit-tease .authorship .author-name, .gh-header-meta .author, .timeline-comment-header .author,
+  .commit-tease .authorship .author-name, .gh-header-meta .author, .timeline-comment-header .author,
   .timeline-commits .author, .new-discussion-timeline .sidebar-milestone .milestone-name,
   .sidebar-assignee .assignee, .rss-subscribe, .sidebar-module h3 a, .sidebar-module h3.disable span, .menu a, .octotip, .graph-canvas .activity,
   .boxed-group .boxed-group-inner, .ace_gutter-active-line, .billing-section .section-content,
   .discussion-item .renamed-was, .discussion-item .renamed-is, a.discussion-item-entity, span.discussion-item-entity,
   .table-list-header-toggle .btn-link.selected, .table-list-header-toggle .btn-link.selected:hover,
   .table-list-header-toggle .btn-link:hover, a.issue-title-link, .table-list-item p,
-  .table-list-milestones .milestone-title-link a, .org-header .edit-org, .blob-code, .diff-line-code, .clone-url-button > a,
+  .table-list-milestones .milestone-title-link a, .org-header .edit-org, .blob-code, .blob-code-inner, .diff-line-code, .clone-url-button > a,
   .contrib-number, .pulse-summary .summary-box .count, .list-options .selected .list-item-title,
   .nav-bar-inner .brand-logo-invertocat .octicon-mark-github, .menu a .octicon, .issue-list-meta a, .stat-number,
   div.search-form button span, .fullscreen-overlay .octicon:hover:before, .fullscreen-overlay .mega-octicon:hover:before,
   .protip-callout, .fullscreen-overlay textarea:focus, .fullscreen-overlay textarea:hover,
-  #header ul.top-nav > li > a, #header ul.top-nav > li > button, a.octotree_toggle {
+  #header ul.top-nav > li > a, #header ul.top-nav > li > button, a.octotree_toggle, a.team-member-ellipsis:hover,
+  .rendered_html pre, .rendered_html code, .team-grid .team-name {
     color: #c0c0c0 !important;
   }
   h5, h6, .edit-repository-meta, .field label, .boxed-group-list li, .capped-box, .marketing-nav a,
   .table-list-milestones .stat, .commits-listing .commit-group-title .octicon-git-commit,
   .select-menu-header .octicon:hover, .repo-list-description,
   .latest-commit .bubble-content strong, .file .meta, .email-format .email-hidden-toggle a, .file-diffstat,
-  .program-info-column .mega-octicon, .octofication .notice-dismiss:hover, a.discussion-item-toggle-open,
-  a.discussion-item-toggle-closed, .timeline-commits .commit-message a, .markdown-format .intro, .markdown-format code,
-  .markdown-format ol > li::before, a.tabnav-extra {
+  .program-info-column .mega-octicon, .octofication .notice-dismiss:hover, .timeline-commits .commit-message a, .markdown-format .intro, .markdown-format code,
+  .markdown-format ol > li::before, a.tabnav-extra, .tabnav .tabnav-extras, .label-admin, .program-info-column p,
+  .form-checkbox .note {
     color: #a0a0a0 !important;
   }
   /* content text */
   #contributions-calendar .contrib-details div, .mini-icon-remove-close:hover, .tabnav-tabs a, .time,
   .diffstat-bar, .gist-item .metadata .datetime, .list-group-item-meta,
-  a.keyboard-shortcuts, .simple-conversation-list, .simple-conversation-list > li .title .num, .drag-and-drop,
+  a.keyboard-shortcuts, button.keyboard-shortcuts, .simple-conversation-list, .simple-conversation-list > li .title .num, .drag-and-drop,
   .starred-repo .sort-info, .org-stats, .commandbar .choice, .commandbar .loading, .commandbar .description,
   ul.summary-stats li a, .authorship, .sha-block, .gh-header-meta, #last-edit, .setup-header .lead a,
   .repository-meta .edit-link a, .api-status a, .meta li, .who_when a,.numbers-summary a, .numbers-summary .octicon:before,
   .notifications .issue-notification.read .type-icon, .notifications .read a, .auth-form-header .octicon,
   .releases-tag-list p a, .history-link a, a.issue-nwo-link, ul.filter-list .filter-item, .blob-num, .blob-num:before,
   .member-meta .teams-link, .member-meta .btn-link, a.stats-group-stat, ul.comparison-list > li em, ul.comparison-list > li.title,
-  .diffstat-summary {
+  .diffstat-summary, a.team-member-ellipsis, a.discussion-item-toggle-open, a.discussion-item-toggle-closed {
     color: #808080 !important;
   }
   .vcard-detail .octicon, .command-bar .octicon-question:before, .auto-search-group .octicon:before, .news .alert .time,
   .blob-num-expandable .diff-expander, .file-type-icon, .uploaded-files .remove, .releases-tag-list td.date a,
   .fullscreen-overlay .octicon:before, .fullscreen-overlay .mega-octicon:before, .collaborators .collab-remove .remove-link,
   .octofication .notice-dismiss, ul.comparison-list > li .octicon, div.content-header h6, .fullscreen-overlay textarea,
-  #com h2.search-title, .blob-num.non-expandable:hover, .breadcrumb {
+  #com h2.search-title, .blob-num.non-expandable:hover, .breadcrumb, #footer .mega-octicon, .application-authorizations .oauth-app-list-meta,
+  .application-authorizations .oauth-app-owner, .boxed-group-inner .help, .thread-subscription-status .reason, .clone-url input.input-mini {
     color: #666 !important;
   }
   .context-pane .selector-item:hover a, .mega-icon:before, .mini-icon-public-repo:before, .mini-icon-pull-request, .mini-icon-remove-close,
   }
   .timeline-comment-header .timestamp, .vcard-stat:hover .text-muted, .boxed-group > h3 a,
   .boxed-group .heading a, .select-menu-item a, .list-heading a, .close-button, .timeline-comment-action, a.timeline-comment-action,
-  a.comment-type-icon {
+  a.comment-type-icon, .timeline-comment-actions .octicon {
     color: inherit !important;
   }
   /* Alerts and activity, remove background gradient */
   .authors-and-code .deletions, .diffstat .diffstat-bar.diff-deleted, span.diffstat .diffstat-bar i.minus,
   .icon-for-failure, ul.summary-stats li .octicon-issue-closed, .branch-delete, #toc .octicon-diff-removed,
   .pagehead-actions .octicon-mute, .highlight .gd, .settings-email .email-actions .settings-remove-email,
-  .uploaded-files .remove:hover, .collaborators .collab-remove .remove-link:hover, .minibutton.danger {
+  .uploaded-files .remove:hover, .collaborators .collab-remove .remove-link:hover, .minibutton.danger,
+  .octicon-btn-danger:hover {
     color: #c31e16 !important;
   }
 
   /* === Yellow panel === */
   .branch-status.status-pending .discussion-item-icon, .discussion-event-status-renamed .discussion-item-icon,
   .state-indicator.renamed, .discussion-topic .branch-status.status-pending, .secret .repo-label span, .compare-pr-placeholder,
-  .compare-cutoff, .diff-cutoff, .flash.flash-warn, .flash-global.flash-war {
+  .compare-cutoff, .diff-cutoff, .flash.flash-warn, .flash-global.flash-warn {
     background: #383812 !important;
     border-color: #884 !important;
     color: #aa6 !important;
     background: #6E5494 !important;
   }
   /* purple text */
-  ul.summary-stats li .octicon-git-pull-request, .pull-request-notification .type-icon {
+  ul.summary-stats li .octicon-git-pull-request, .pull-request-notification .type-icon .type-icon-state-merged {
     color: #6E5494 !important;
   }
   .diagram-icon-small.active .mega-octicon:before {
     border-color: transparent #333 transparent transparent !important;
   }
   /* octocat spinners */
-  img[src*="octocat-spinner"] {
+  img[src*="octocat-spinner"], img[src="/images/spinner.gif"] {
     width: 0 !important;
     height: 0 !important;
   }
-  img[src*="octocat-spinner"], .facebox-loading, .branch-action-body .spinner, .status-indicator-loading {
+  img[src*="octocat-spinner"], img[src="/images/spinner.gif"], .facebox-loading, .branch-action-body .spinner,
+  .status-indicator-loading {
     background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiB3aWR0aD0iNTEyIiBoZWlnaHQ9IjUxMiI+PHBhdGggZmlsbD0iIzMzMyIgZD0ibTMzMi4yODk0MjkgODcuMDg3MjE5YzYwLjAzMzI5NSAtMjAgMTE0IC0yMSAxNzIgMS4wNDcyNDFsLTExLjQwMzU5NSAzMi44NTA5NTJjLTQzLjMzMzM0NCAtMTUgLTEwNCAtMTUgLTE0OCAwIiB0cmFuc2Zvcm09InJvdGF0ZSg0NSA0MTguNzU3IDk2LjE4ODUpIj48YW5pbWF0ZSBhdHRyaWJ1dGVOYW1lPSJmaWxsIiB2YWx1ZXM9IiMzMzM7I2VlZTsjMzMzOyMzMzMiIGJlZ2luPSIwcyIgZHVyPSIxcyIgcmVwZWF0Q291bnQ9ImluZGVmaW5pdGUiLz48L3BhdGg+PHBhdGggZmlsbD0iIzMzMyIgZD0ibTM5OC41Mjc0NjYgMjQ2LjM4ODU5NmM2MC4wMzMzMjUgLTIwIDExNCAtMjEgMTcyIDEuMDQ3MjQxbC0xMS40MDM1NjQgMzIuODUwOTY3Yy00My4zMzMzNzQgLTE1IC0xMDQgLTE1IC0xNDggMCIgdHJhbnNmb3JtPSJyb3RhdGUoOTAgNDg0Ljk5NSAyNTUuNDkpIj48YW5pbWF0ZSBhdHRyaWJ1dGVOYW1lPSJmaWxsIiB2YWx1ZXM9IiMzMzM7I2VlZTsjMzMzOyMzMzMiIGJlZ2luPSIwLjEyNXMiIGR1cj0iMXMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIi8+PC9wYXRoPjxwYXRoIGZpbGw9IiMzMzMiIGQ9Im0zMzEuMzMyMjE0IDQwNC44MjM2NjljNjAuMDMzMzI1IC0yMCAxMTQgLTIxIDE3MiAxLjA0NzI0MWwtMTEuNDAzNTM0IDMyLjg1MDk1MmMtNDMuMzMzNDA1IC0xNSAtMTA0IC0xNSAtMTQ4IDAiIHRyYW5zZm9ybT0icm90YXRlKDEzNSA0MTcuOCA0MTMuOTI1KSI+PGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iZmlsbCIgdmFsdWVzPSIjMzMzOyNlZWU7IzMzMzsjMzMzIiBiZWdpbj0iMC4yNTBzIiBkdXI9IjFzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIvPjwvcGF0aD48cGF0aCBmaWxsPSIjMzMzIiBkPSJtMTcxLjU4MjIzIDQ3MC4zMjM2NjljNjAuMDMzMzEgLTIwIDExNCAtMjEgMTcyIDEuMDQ3MjQxbC0xMS40MDM1MzQgMzIuODUwOTUyYy00My4zMzM0MDUgLTE1IC0xMDQgLTE1IC0xNDggMCIgdHJhbnNmb3JtPSJyb3RhdGUoMTgwIDI1OC4wNSA0NzkuNDI1KSI+PGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iZmlsbCIgdmFsdWVzPSIjMzMzOyNlZWU7IzMzMzsjMzMzIiBiZWdpbj0iMC4zNzVzIiBkdXI9IjFzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIvPjwvcGF0aD48cGF0aCBmaWxsPSIjMzMzIiBkPSJtMTMuMDgyMiA0MDYuMDc0MDA1YzYwLjAzMzMwMSAtMjAgMTE0IC0yMSAxNzIgMS4wNDY5OTdsLTExLjQwNDAwNyAzMi44NTA5ODNjLTQzLjMzMjk5MyAtMTUgLTEwNCAtMTUgLTE0OCAwIiB0cmFuc2Zvcm09InJvdGF0ZSgtMTM1IDk5LjU1IDQxNS4xNzUpIj48YW5pbWF0ZSBhdHRyaWJ1dGVOYW1lPSJmaWxsIiB2YWx1ZXM9IiMzMzM7I2VlZTsjMzMzOyMzMzMiIGJlZ2luPSIwLjUwMHMiIGR1cj0iMXMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIi8+PC9wYXRoPjxwYXRoIGZpbGw9IiMzMzMiIGQ9Im0tNTMuNzEzNDg2IDI0Ny4wOTE1NTNjNjAuMDMzMzEgLTIwIDExNCAtMjEgMTcyIDEuMDQ2OTk3bC0xMS40MDQwMjIgMzIuODUwOTgzYy00My4zMzI5NzcgLTE1IC0xMDQgLTE1IC0xNDggMCIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDMyLjc1NCAyNTYuMTkzKSI+PGFuaW1hdGUgYXR0cmlidXRlTmFtZT0iZmlsbCIgdmFsdWVzPSIjMzMzOyNlZWU7IzMzMzsjMzMzIiBiZWdpbj0iMC42MjVzIiBkdXI9IjFzIiByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIvPjwvcGF0aD48cGF0aCBmaWxsPSIjMzMzIiBkPSJtMTIuODgzNjIxIDg3LjA2MTQ4NWM2MC4wMzMyOTUgLTIwIDExNCAtMjEgMTcyIDEuMDQ3MjQ5bC0xMS40MDM1OTUgMzIuODUwOTUyYy00My4zMzMzNDQgLTE1IC0xMDQgLTE1IC0xNDggMCIgdHJhbnNmb3JtPSJyb3RhdGUoLTQ1IDk5LjM1MTQgOTYuMTYyOCkiPjxhbmltYXRlIGF0dHJpYnV0ZU5hbWU9ImZpbGwiIHZhbHVlcz0iIzMzMzsjZWVlOyMzMzM7IzMzMyIgYmVnaW49IjAuNzUwcyIgZHVyPSIxcyIgcmVwZWF0Q291bnQ9ImluZGVmaW5pdGUiLz48L3BhdGg+PHBhdGggZmlsbD0iIzMzMyIgZD0ibTE3Mi45MDY2MzEgMjAuOTI5NzQxYzYwLjAzMzMxIC0yMCAxMTQgLTIxIDE3MiAxLjA0NzIzbC0xMS40MDM1OTUgMzIuODUwOTZjLTQzLjMzMzM0NCAtMTUgLTEwNCAtMTUgLTE0OCAwIj48YW5pbWF0ZSBhdHRyaWJ1dGVOYW1lPSJmaWxsIiB2YWx1ZXM9IiMzMzM7I2VlZTsjMzMzOyMzMzMiIGJlZ2luPSIwLjg3NXMiIGR1cj0iMXMiIHJlcGVhdENvdW50PSJpbmRlZmluaXRlIi8+PC9wYXRoPjxwYXRoIGZpbGw9IiNlZWUiIGQ9Im0gMTk3IDQ1OSBjIDAgMCAwIC00OCAwIC00OCAwIDAgLTQgLTQgLTMzIC0xIC0yOCAzIC02MiAtNjYgLTY1IC02OSAyNCAtMTAgNDMgMjYgNjUgMzggMCAwIDMxIDAgMzEgMCAwIDAgMyAtNDQgMjAgLTM3IDE3IDYgLTcyIDEgLTk3IC02MSAtMjUgLTYyIDE5IC0xMjYgMjAgLTExNSAwIDkgLTE3IC0zNSAtMTAgLTQ2IDIwIC0yNCA1MCAxMSA2OSAxNSA1IDAgMTggLTggNTkgLTcgNDEgMCA1NSA4IDYwIDYgMjIgLTEwIDUxIC0zMiA2NSAtMTcgMTAgMTIgLTEgNjEgLTEgNDkgMCAtMTIgNDMgODEgNiAxMzIgQyAzNTcgMzQ0IDI5MSAzNDEgMzAyIDM0NCBjIDIxIDE1IDE0IDkxIDE0IDExNSBsIC0yMiA0IDAgLTc0IGMgMCAtOSAtOSAtMTAgLTkgLTkgbCAwIDg1IC0yMSAxIDAgLTg2IC0xMCAwIDAgODYgLTIwIC0xIDAgLTgzIGMgMCAwIC04IC0xIC04IDEwIGwgMCA3MiIvPjwvc3ZnPg==) !important;
     background-size: contain !important;
   }
   img[src*="octocat-spinner"][width="64"]  { padding: 32px !important }
   img[src*="octocat-spinner"][width="32"]  { padding: 16px !important }
   img[src*="octocat-spinner"][width="16"]  { padding: 8px  !important }
+  img[src="/images/spinner.gif"] { padding: 32px !important }
 
   .branch-action-body .spinner, div.facebox-loading, .status-indicator-loading {
     background-position: center center !important;
   }
 
   /* image preview background */
-  .render-shell img, .file .image img, .file .image canvas {
+  .render-shell .img-view img, .file .image img, .file .image canvas {
     background-image: url('data:image/gif;base64,R0lGODlhCgAKAIAAABoaGgAAACwAAAAACgAKAAACEYQdmYcaDNxjEspKndVZbc8UADs=') !important;
   }
 
     border-bottom: #343434 8px solid !important;
   }
   /* inline code - add with border */
-  .markdown-format pre, .markdown-body pre, .markdown-format .highlight pre, .markdown-body .highlight pre, body.blog pre,
+  .markdown-format code, .markdown-body code, .markdown-body tt, .markdown-format pre,
+  .markdown-body pre, .markdown-format .highlight pre, .markdown-body .highlight pre,
+  body.blog pre {
+    border: 1px solid rgba(255,255,255,.1) !important;
+  }
   #facebox pre, #contributors-master svg.viz {
     border: 1px solid #343434 !important;
   }
     border-color: /*[[base-color]]*/ #4183C4 !important;
     color: #fff !important;
   }
-  .zh-pipeline-issue-toggler:hover {
+  .zh-pipeline-issue-toggler:hover, .date_selector .date-button {
     color: /*[[base-color]]*/ #4183C4 !important;
   }
   /* background */
     background-color: #111 !important;
     border-color: #484848 !important;
   }
-  li.zh-pipeline, li.new-pipeline-column, .zh-schema-pipelines {
+  li.zh-pipeline, li.new-pipeline-column, .zh-schema-pipelines, .zh-pipeline-issue-heading {
     background-color: #181818 !important;
     border-color: #484848 !important;
   }
   li.zh-pipeline-issue, .zh-pipeline-issue-content, .zh-issue-meta, .zh-pipeline-issue-action,
-  .zh-pipeline-heading-container, .zh-button-grey, .zh-board-menu, .zh-schema-title {
+  .zh-pipeline-heading-container, .zh-button-grey, .zh-board-menu, .zh-schema-title,
+  .zh-burndown-chart .milestone-start-calendar-container {
     background-color: #222 !important;
     border-color: #484848 !important;
   }
     background: #333 !important;
   }
   /* border */
-  .zh-paw-btn-inner, .zh-schema, .zh-schema-pipeline-name, .popover, .zh-uploader-drop {
+  .zh-paw-btn-inner, .zh-schema, .zh-schema-pipeline-name, .popover, .zh-uploader-drop,
+  .zh-milestone-dates, .zh-burndown-chart-container, .zh-burndown-chart .stats-container {
     border-color: #484848 !important;
   }
   .popover.right .arrow {
     border-right-color: #484848 !important;
   }
-  .file-commit-form .commit-form:before, .file-commit-form .commit-form:after {
+  .file-commit-form .commit-form:before, .file-commit-form .commit-form:after, .zh-burndown .stats-item {
     border-right-color: #343434 !important;
   }
   /* text */
   }
   /* invert image */
   .zh-upload-image {
-    filter: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><filter id='i'><feColorMatrix color-interpolation-filters='srgb' values='-.35 .35 .35 0 0, .25 .25 .25 0 0, .15 .15 .15 0 0, 0 0 0 1 0'/></filter></svg>#i");
     -webkit-filter: invert(40%) !important;
+            filter: invert(40%) !important;
+  }
+  .zh-icon-burndown {
+    -webkit-filter: invert(100%) !important;
+            filter: invert(100%) !important;
   }
   /* webkit scrollbars */
   .zh-pipeline-issues-wrapper::-webkit-scrollbar-track {
     background: #444 !important;
   }
 
-  /* custom language colors */
-  .language-color {
-    filter: brightness(150%) !important;
-    -webkit-filter: brightness(150%) !important;
-  }
-
   /* OS X font rendering tweak, only active on sub-retina pixel ratios, might affect
    * Chrome on other OSs too, see https://github.com/StylishThemes/GitHub-Dark/issues/86
    */
     }
   }
 
-  /* inline code blocks - selector group is completed by the theme file */
+  /* inline code - single lines */
+  .markdown-body code, .markdown-body tt, .protip code, .content dl code, .content ul code, p code,
+  body.blog pre > code, .content .sectionbody .dlist dt, .content p > tt, .content .sectionbody .dlist dt,
+  .content p > tt, .commit-sha, .commit-preview .message pre, .rendered_html pre, .rendered_html code {
+    background: #202020 !important;
+  }
+
+  /* inline code - big blocks */
   pre, .markdown-format pre, .markdown-body pre, .markdown-format .highlight pre, .markdown-body .highlight pre,
   body.blog pre, #facebox pre, .blob-code-context, .blob-num-context, .blob-expanded, .terminal, .copyable-terminal,
+  #notebook .input_area,
 
   /*[[syntax-theme]]*/
   /* grunt build - remove to end of file */
   .ace_editor .ace_xml-pe{color:#494949!important}
   .ace_editor .ace_indent-guide{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y!important}
 
+  /* Jupyter Notebooks */
+  /*! Twilight; https://gist.github.com/dansimpson/803005 */
+  #notebook .highlight, #notebook .highlight pre,
+  #notebook .highlight table { background: #181818 !important; color: #F8F8F8 !important;font-family: Consolas, Monaco,"Lucida Console" !important; }
+  #notebook .highlight * { font-family: Consolas, Monaco,"Lucida Console" !important; color: #F8F8F8 !important; }
+  #notebook .highlight .hll { background-color: #ffffcc !important; }
+  #notebook .highlight .c { color: #5F5A60 !important; font-style: italic !important; } /* Comment */
+  #notebook .highlight .err { border:#B22518 !important; } /* Error */
+  #notebook .highlight .k { color: #CDA869 !important; } /* Keyword */
+  #notebook .highlight .cm { color: #5F5A60 !important; font-style: italic !important; } /* Comment.Multiline */
+  #notebook .highlight .cp { color: #5F5A60 !important; } /* Comment.Preproc */
+  #notebook .highlight .c1 { color: #5F5A60 !important; font-style: italic !important; } /* Comment.Single */
+  #notebook .highlight .cs { color: #5F5A60 !important; font-style: italic !important; } /* Comment.Special */
+  #notebook .highlight .gd { background: #420E09 !important; } /* Generic.Deleted */
+  #notebook .highlight .ge { font-style: italic !important; } /* Generic.Emph */
+  #notebook .highlight .gr { background: #B22518 !important; } /* Generic.Error */
+  #notebook .highlight .gh { color: #000080 !important; font-weight: bold !important; } /* Generic.Heading */
+  #notebook .highlight .gi { background: #253B22 !important; } /* Generic.Inserted */
+  #notebook .highlight .go { } /* Generic.Output */
+  #notebook .highlight .gp { font-weight: bold !important; } /* Generic.Prompt */
+  #notebook .highlight .gs { font-weight: bold !important; } /* Generic.Strong */
+  #notebook .highlight .gu { color: #800080 !important; font-weight: bold !important; } /* Generic.Subheading */
+  #notebook .highlight .gt { } /* Generic.Traceback */
+  #notebook .highlight .kc { } /* Keyword.Constant */
+  #notebook .highlight .kd { color: #e9df8f !important; } /* Keyword.Declaration */
+  #notebook .highlight .kn { } /* Keyword.Namespace */
+  #notebook .highlight .kp { color: #9B703F !important; } /* Keyword.Pseudo */
+  #notebook .highlight .kr { } /* Keyword.Reserved */
+  #notebook .highlight .kt { } /* Keyword.Type */
+  #notebook .highlight .m { } /* Literal.Number */
+  #notebook .highlight .s { } /* Literal.String */
+  #notebook .highlight .na { color: #F9EE98 !important; } /* Name.Attribute */
+  #notebook .highlight .nb { color: #CDA869 !important; } /* Name.Builtin */
+  #notebook .highlight .nc { color: #9B859D !important; font-weight: bold !important; } /* Name.Class */
+  #notebook .highlight .no { color: #9B859D !important; } /* Name.Constant */
+  #notebook .highlight .nd { color: #7587A6 !important; } /* Name.Decorator */
+  #notebook .highlight .ni { color: #CF6A4C !important; font-weight: bold !important; } /* Name.Entity */
+  #notebook .highlight .nf { color: #9B703F !important; font-weight: bold !important; } /* Name.Function */
+  #notebook .highlight .nn { color: #9B859D !important; font-weight: bold !important; } /* Name.Namespace */
+  #notebook .highlight .nt { color: #CDA869 !important; font-weight: bold !important; } /* Name.Tag */
+  #notebook .highlight .nv { color: #7587A6 !important; } /* Name.Variable */
+  #notebook .highlight .ow { color: #AA22FF !important; font-weight: bold !important; } /* Operator.Word */
+  #notebook .highlight .w { color: #141414 !important; } /* Text.Whitespace */
+  #notebook .highlight .mf { color: #CF6A4C !important; } /* Literal.Number.Float */
+  #notebook .highlight .mh { color: #CF6A4C !important; } /* Literal.Number.Hex */
+  #notebook .highlight .mi { color: #CF6A4C !important; } /* Literal.Number.Integer */
+  #notebook .highlight .mo { color: #CF6A4C !important; } /* Literal.Number.Oct */
+  #notebook .highlight .sb { color: #8F9D6A !important; } /* Literal.String.Backtick */
+  #notebook .highlight .sc { color: #8F9D6A !important; } /* Literal.String.Char */
+  #notebook .highlight .sd { color: #8F9D6A !important; font-style: italic !important; } /* Literal.String.Doc */
+  #notebook .highlight .s2 { color: #8F9D6A !important; } /* Literal.String.Double */
+  #notebook .highlight .se { color: #F9EE98 !important; font-weight: bold !important; } /* Literal.String.Escape */
+  #notebook .highlight .sh { color: #8F9D6A !important; } /* Literal.String.Heredoc */
+  #notebook .highlight .si { color: #DAEFA3 !important; font-weight: bold !important; } /* Literal.String.Interpol */
+  #notebook .highlight .sx { color: #8F9D6A !important; } /* Literal.String.Other */
+  #notebook .highlight .sr { color: #E9C062 !important; } /* Literal.String.Regex */
+  #notebook .highlight .s1 { color: #8F9D6A !important; } /* Literal.String.Single */
+  #notebook .highlight .ss { color: #CF6A4C !important; } /* Literal.String.Symbol */
+  #notebook .highlight .bp { color: #00aaaa !important; } /* Name.Builtin.Pseudo */
+  #notebook .highlight .vc { color: #7587A6 !important; } /* Name.Variable.Class */
+  #notebook .highlight .vg { color: #7587A6 !important; } /* Name.Variable.Global */
+  #notebook .highlight .vi { color: #7587A6 !important; } /* Name.Variable.Instance */
+  #notebook .highlight .il { color: #009999 !important; } /* Literal.Number.Integer.Long */
+
index 8dca5866eadfe9b446cc49c615d9d4eea98b253c..d8d169593c9306e7113e563051f7026f34c46f80 100644 (file)
@@ -1,5 +1,5 @@
  /***************************************************************
- StackOverflow Dark v2.6.2 (2/26/2015)
+ StackOverflow Dark v2.7.3 (5/21/2015)
  https://github.com/StylishThemes/StackOverflow-Dark
  http://userstyles.org/styles/35345
 
   color: /*[[base-color]]*/ #008080 !important
  }
 
- .nav .primarynav li a:hover {
+ .nav .primarynav li a:hover, .message.message-config .actions .button, .btn-careers:hover,
+ .btn-careers:visited {
   color: #fff !important;
   background: /*[[base-color]]*/ #008080 !important;
  }
 
  .post-tag:hover, .comments-link:hover, .summary .post-tag:hover , .commentslink, .bounty-indicator,
- .bounty-indicator-tab, .bounty-award, span.bounty-indicator-tab {
+ .bounty-indicator-tab, .bounty-award, span.bounty-indicator-tab, #change-picture, .top-badge,
+ .supernovabg, .hotbg, .nav li.youarehere a, .nav a:hover, a.button:hover, .edit-count {
   background-color: /*[[base-color]]*/ #008080 !important;
   color: #eee !important;
  }
@@ -52,7 +54,7 @@
   border-color: /*[[base-color]]*/ #008080 !important;
   box-shadow: 0px 1px 2px rgba(255, 255, 255, 0.075) inset, 0px 0px 5px rgba(255, 255, 255, .075) !important;
  }
- .tag-editor input:focus {
+ .tag-editor input:focus, .previous-button, .next-button {
   border: 0 !important;
   box-shadow: none !important;
  }
@@ -67,6 +69,9 @@
  .search-container input[type=text] {
   background-color: #000 !important;
  }
+ .popup-badges .all-badge-progress .completed:before, .previous-button, .next-button {
+  background-color: rgba(0,0,0,0.4) !important;
+ }
 
  #custom-header, .review-bar, .diff-choices a.selected, #header #topbar, td.owner, a.owner, .question-status,
  .profile-popup, .profile-popup div, .profile-popup th, .profile-popup td, #global, .actual-edit-overlay,
@@ -75,7 +80,7 @@
   color: #ddd !important;
  }
 
- .summary .post-tag, .onebox, .profile-ad {
+ .summary .post-tag, .onebox, .profile-ad, .message.message-config {
   background: #151515 !important;
  }
 
   border: 1px solid transparent !important;
  }
 
- #tabs a.youarehere, .tag-suggestions {
+ #tabs a.youarehere, .tabs a.youarehere, .tag-suggestions {
   background: #191919 !important;
   border: 1px solid #444 !important;
  }
+ .tabs a.youarehere {
+  border-bottom: 0 !important;
+ }
 
- #user-about-me, .user-about-me, .mine .messages {
+
+ #user-about-me, .user-about-me, .mine .messages, .avatar-card, .tag-container {
   background: #191919 !important;
-  border: 0px !important;
+  border: 0 !important;
   color: #C1BEBA !important;
  }
 
- .topbar-dialog, .topbar-dialog .header, .share-tip, #input-area,
+ .topbar-dialog, .topbar-dialog .header, .share-tip, #input-area, .messages,
  #tag-menu, .sidebar h3, #overlay-header, .action-list .action-selected, .switcher-nudge-lightbox,
  .user-rep-chart-summary-tooltip:hover, .current-site-container {
   background-color: #222 !important;
 
  .profile-popup, .profile-popup tr, .profile-popup th, .profile-gravatar, .newuser, .roomcard,
  .seWrapper, h2.index.header, .privilege-table-row:hover, .list-originals .item.hover,
- .list-originals .body-summary, .review-instructions-reason {
+ .list-originals .body-summary, .review-instructions-reason, .room-mini {
   background-color: #222 !important;
   border-color: #555 !important;
   color: #ddd !important;
   -webkit-border-radius: 3px !important;
   border-radius: 3px !important;
  }
+ .calendar, .calendar-small, .mspark .mspbar {
+  background: #222 !important;
+ }
 
- .ad502-room {
+ .ad502-room, .message.message-config .actions, .tag-container .col {
   background-color: #232323 !important;
   border: 1px solid #191919 !important;
  }
 
- .rep-recent-row, .bounty, .diff-choices a:hover, div.meter, .narrow .votes, .ob-post-votes {
+ .rep-recent-row, .bounty, .diff-choices a:hover, div.meter, .narrow .votes, .ob-post-votes, .card {
   background-color: #232323 !important;
   color: #bbb !important;
  }
 
- .answer, #system-message, .commentlist, .revision td, #hero-content, .mdhelp-tabs .selected, .tabs .selected {
+ .answer, #system-message, .commentlist, .revision td, #hero-content, .mdhelp-tabs .selected, .tabs .selected,
+ .rep-card .rep-col {
   background: #232323 !important;
   color: #999 !important;
  }
 
- .tagged-interesting, .tagged-interesting .views, .highlight-row, .highlighted {
+ .tagged-interesting, .tagged-interesting .views, .highlight-row, .highlighted, .card.rep-card .graph,
+ .popup-badges .badge-progress:hover:not(.completed) {
   background-color: #242424 !important;
   background-image: none !important;
  }
  .nav li, .seNav, .topbar a.topbar-icon-on, .topbar a.topbar-icon-on:hover, .owner, .nav a,
  .module li.current, .seCurrent, .community-bulletin, .owner-revision td, .markdown-diff .skip,
  #footer .container, .body-diffs .skip, .newsletter-anon, .tag-suggestions>div:hover,
- .topbar-dialog .modal-content li:hover, .timestamp:hover+div.message .meta, div.message:hover .meta {
+ .topbar-dialog .modal-content li:hover, .timestamp:hover+div.message .meta, div.message:hover .meta,
+ #side-menu ul li a:hover, .conversation-info, .message.reply-parent, .message.reply-child {
   background-color: #333 !important;
  }
 
  .owner-answer, .question-status, .notification, #feed-ticker, #top-menu, .vote-revision td,
- .topbar-dialog .unread-item {
+ .topbar-dialog .unread-item, .privileges-wrapper .stroke, .progress-bar .bar {
   background: #404040 !important;
  }
 
  }
 
  /* === Brown(ish) === */
- .new-post-activity, #new-answer-activity {
-  background-color: #840 !important;
+ .new-post-activity, #new-answer-activity, .val-info, .highlight {
+  background-color: #321 !important;
  }
 
  /* chat room buttons */
   color: #eee !important;
  }
 
- .supernovabg, .hotbg, .nav li.youarehere a, .nav a:hover, a.button:hover {
-  background-color: #d80 !important;
- }
-
  /* === Green === */
- .accepted-answer, .suggested-edit .inserted, .markdown-diff .inserted {
+ .accepted-answer, .suggested-edit .inserted, .markdown-diff .inserted, .rep-increase, .progress-bar .percent,
+ .recommended, .vote.accepted {
   background: #232 !important;
  }
 
+ /* accepted answer code blocks */
+ .accepted-answer pre, .accepted-answer code, .accepted-answer .pln, .accepted-answer .youarehere {
+  background: #202A20 !important;
+ }
+
  .answered, .answer-votes, .answered .vote-count-post {
   background: #232323 !important;
   color: #4b553c !important
 
  /* === Transparent background === */
  div.message .meta, .spaces, .comment, span.feed-icon, a.role-switch, .nav.careers li, .nav.careers li:hover,
- .switcher-nudge-content p, #content, #tabs a, #chat .username, #chat .messages {
+ .switcher-nudge-content p, #content, #tabs a, .tabs a, #chat .username, #chat .messages, .tag-container {
   background-color: transparent !important;
  }
 
   border-color: #333 !important;
  }
 
- #tabs a.youarehere {
-  border-bottom: 1px solid #191919 !important;
+ .message .message-tip-top-right:before, .message .message-tip-top-left:before {
+  border-bottom-color: #191919 !important;
+ }
+
+ .left-arrow {
+  border-right-color: rgba(119,119,119,0.4) !important;
+ }
+ .previous-button:hover .left-arrow {
+  border-right-color: #c0c0c0 !important;
+ }
+ .right-arrow {
+  border-left-color: rgba(119,119,119,0.4) !important;
+ }
+ .next-button:hover .right-arrow {
+  border-left-color: #c0c0c0 !important;
  }
 
  /* === No/hide border === */
  div.list > div {
   border-right: 0 !important;
  }
-
- .module {
+ .module, .tabs a, div.message {
   border-color: transparent !important;
  }
+ .left-arrow, .right-arrow {
+  border-bottom-color: transparent !important;
+  border-top-color: transparent !important;
+ }
+ div.message:hover, .timestamp:hover + div.message {
+  visibility: inherit;
+  border: 1px dotted #333;
+ }
 
  /* blue label count */
- .bounty-indicator-tab {
-  background: #07d !important;
+ .bounty-indicator-tab, .hero.profile {
+  background: #046 !important;
   color: #ccc !important;
  }
 
  /* === Text Color === */
  div, input, .accepted-answer .post-text, .accepted-answer .user-action-time, #question-header a,
  .post-text, .user-info, .topbar-dialog .header h3, .topbar-dialog .header h3 a, .topbar-dialog span,
- .search-result .answered .vote-count-post strong, .votes-cast-stats th, .subheader h1 {
+ .search-result .answered .vote-count-post strong, .votes-cast-stats th, .subheader h1, .vote.accepted,
+ .message.message-config h1, .message.message-config h2, .message.message-config h3, .message.message-config h4 {
   color: #ddd !important;
  }
 
  }
 
  .comment, #top-menu a, .subheader a, .reputation a, .reputation-score, a:visited, .relativetime.old,
- .votes-cast-stats td, .mini-counts span, #chat .system-message {
+ .votes-cast-stats td, .mini-counts span, #chat .system-message, .card .rep, a.badge, a.badge-tag,
+ .user-card .user-stats .number, .user-card .user-card-name {
   color: #aaa !important;
  }
+ .ob-post-tag, .ob-user-tag {
+  color: #999 !important;
+ }
 
  .answered-accepted strong, .youarehere, .nav .primarynav li a, .nav a, a:hover, .rep-up.special-rep {
   color: #fff !important
   white-space: nowrap !important
  }
 
+ .tag-container .col {
+  margin: 0 !important;
+  border: #333 1px solid !important;
+ }
+ .tag-container.row {
+  margin: 2px !important;
+ }
  .stats {
   margin-top: 5px !important;
  }
-
  #hsearch, .statscontainer {
   margin-right: 5px !important;
  }
-
  .stats {
   margin-bottom: 4px !important;
  }
  a.badge[title^="gold"], a.badge-tag[title^="gold"], .badge1 + .badgecount {
   color: #ffcc46 !important;
  }
- .badge-tag {
+ .badge-tag, a.tag, .ob-post-tag, .ob-user-tag {
   background-color: #191919 !important;
   border-color: #111 !important;
  }
+ .badge3-alternate, .progress-bar.badge-3 .bar .percent {
+  background-color: #7C4318 !important; /* bronze */
+ }
+ .badge2-alternate, .progress-bar.badge-2 .bar .percent {
+  background-color: #464a4f !important; /* silver */
+ }
+ .badge1-alternate, .progress-bar.badge-1 .bar .percent {
+  background-color: #957000 !important; /* gold */
+ }
 
  /* === code & syntax highlighting === */
  pre, code, .pln, .youarehere {
index 9df8fbf2e43b9ccebed94961e16869716aa281e3..12243c25fc7ca79c3d38075a64e884c3756a4fb4 100644 (file)
@@ -41,10 +41,33 @@ section {
   background-color: #222222 !important;
 }
 
+/* always show search */
+/*
+header#top-nav #header-search #header-search-query {
+  padding: 7px 12px !important;
+  width: 250px !important;
+}
+
+header#top-nav #header-search #header-search-type {
+  opacity: 1 !important;
+}
+
+header#top-nav #header-search #header-search-button {
+  opacity: 0 !important;
+} */
+
 .comment-wrapper {
   background-color: #1d1d1d !important;
 }
 
+.above-comment {
+  background-color: #252525 !important;
+}
+
+.new-comment-wrapper textarea {
+  background-color: #2f2f2f !important;
+}
+
 .panel, .form-control {
   background-color: #1d1d1d !important;
 }
diff --git a/dwb/userstyles/xkcd.com.css b/dwb/userstyles/xkcd.com.css
new file mode 100644 (file)
index 0000000..f06fd87
--- /dev/null
@@ -0,0 +1,31 @@
+:not(img) {
+  background-color: rgba(34, 34, 34, 0.5) ! important;
+  background-image: none !important;
+  color: #D4D2CF ! important;
+}
+
+body, html {
+  background-color: #222222 ! important;
+  background-image: none !important;
+}
+
+.dwb_hint {
+  background-color: #222222 ! important;
+}
+
+:link, :link * {
+  color: #5DC3D7 !important;
+}
+
+:visited, :visited * {
+  color: #666665 !important;
+}
+
+.tagContainer {
+  display: none;
+}
+
+img.illustration {
+  -webkit-filter: invert(100%) !important;
+  background-color: transparent !important;
+}
index 0eba7845d02f7dcf79c2bd62798dea32eb365b7a..baaa97558f4ce4807cf9c697794735c0277b05f1 100644 (file)
@@ -32,15 +32,11 @@ templates: # {{{1
 
 
   usenet-movies: # {{{2
-    set:
-      category: 'movies'
     inputs:
       - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # Movies HD
 
 
   usenet-tv: # {{{2
-    set:
-      category: 'tv'
     inputs:
       - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030,5040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # TV SD/HD
 
@@ -73,9 +69,29 @@ templates: # {{{1
         - \b Go\):        {from: title} # filter those misplaced french only movies
 
 
-  tv: # {{{2
+  series: # {{{2
+    set:
+      category: 'series'
+    series:
+      settings:
+        default: &default_settings
+          identified_by: ep
+          timeframe: 12 hours
+          target: 1080p webdl h264+
+          quality: 480p+ h264+
+          upgrade: yes
+    exists_series:
+      path:
+        - '/mnt/Skaro/Series/{{tvdb_series_name}}'
+      allow_different_qualities: better
+    content_size:
+      min:  100
+      max: 6000
+      strict: yes
+
+  series-list: # {{{2
     series:
-      normal:
+      default:
         - 8 out of 10 cats
         - american dad
         - archer 2009
@@ -115,11 +131,40 @@ templates: # {{{1
         - the wire: { quality: 720p+ }
 
 
+  series-trakt: # {{{2
+    configure_series:
+      from:
+        trakt_list:
+          username: Ram-Z
+          list: followlist
+          type: shows
+      settings: *default_settings
+
+
+  series-trakt-backfill: # {{{2
+    configure_series:
+      from:
+        trakt_list:
+          username: Ram-Z
+          list: backfill
+          type: episodes
+      settings: # *default_settings
+        identified_by: ep
+        quality: 720p+ h264+
+    discover:
+      interval: 1 hours
+      what:
+        - emit_series:
+            from_start: yes
+      from:
+        - newznab:
+            url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=tvsearch&cat=5030,5040&extended=1'
+            category: tv
+
+
   movies: # {{{2
-    imdb:
-      min_score: 7.5
-      min_votes: 30000
-    imdb_required: on
+    set:
+      category: 'movies'
     exists_movie:
       path:
         - '/mnt/Skaro/Movies'
@@ -128,10 +173,31 @@ templates: # {{{1
       lookup: imdb
 
 
-  queued-movies: # {{{2
+  movies-imdb: # {{{2
+    imdb:
+      min_score: 7.5
+      min_votes: 30000
+    imdb_required: on
+
+
+  movies-1080p: # {{{2
+    quality: 1080p bluray+ h264+
+    content_size:
+      min:  3000
+      max: 15000
+      strict: yes
+
+
+  movies-720p: # {{{2
+    quality: 720p+ webdl+ h264+
+    delay: 14 days
+    content_size:
+      min:  1000
+      max: 10000
+      strict: yes
+
+  movies-discover-queue: # {{{2
     movie_queue: accept
-    set:
-      category: 'movies'
     discover:
       what:
         - emit_movie_queue: yes
@@ -139,87 +205,121 @@ templates: # {{{1
         - newznab:
             url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=movie&extended=1&cat=2040'
             category: movie
-      interval: 5 seconds
+      interval: 7 days  # search each entry only once a week
+
+
+  trakt-add-collection: # {{{2
+    trakt_add:
+      username: '{{secrets.trakt.login}}'
+      password: '{{secrets.trakt.passw}}'
+      list: collection
 
 
 tasks: # {{{1
-  dl-tv: # {{{2
+  dl-series: # {{{2
     priority: 100
     template:
       - email
-      - tv
+      - series
+      - series-list
+      - series-trakt
       - filters
       - usenet
       - usenet-tv
-    series:
-      settings:
-        normal:
-          timeframe: 12 hours
-          target: 1080p webdl h264+
-          quality: 480p+ h264+
-          upgrade: yes
-    exists_series:
-      path: '/mnt/Skaro/Series/{{tvdb_series_name}}'
-      allow_different_qualities: better
-    content_size:
-      min:  100
-      max: 6000
-      strict: yes
 
 
-  dl-movie-queue-1080p: # {{{2
+  dl-series-trakt-backfill: # {{{2
+    priority: 110
+    template:
+      - series
+      - series-trakt-backfill
+      - filters
+      - usenet
+    digest: backfill
+
+
+  dl-movies-trakt: # {{{2
+    priority: 10
+    trakt_list:
+      username: Ram-Z
+      list: watchlist
+      type: movies
+    accept_all: yes
+    movie_queue: add
+
+
+  dl-movies-discover-queue-1080p: # {{{2
     priority: 100
     template:
       - email
-      - queued-movies
+      - movies
+      - movies-discover-queue
+      - movies-1080p
       - filters
       - usenet
-    quality: 1080p bluray+ h264+
 
 
-  dl-movie-queue-720p: # {{{2
+  dl-movies-discover-queue-720p: # {{{2
     priority: 110
     template:
       - email
-      - queued-movies
+      - movies
+      - movies-discover-queue
+      - movies-720p
       - filters
       - usenet
-    quality: 720p+ webdl+ h264+
-    delay: 14 days
 
 
-  dl-movies-1080p: # {{{2
+  dl-movies-queue-1080p: # {{{2
+    priority: 100
+    template:
+      - email
+      - movies
+      - movies-1080p
+      - filters
+      - usenet
+      - usenet-movies
+
+
+  dl-movies-queue-720p: # {{{2
+    priority: 110
+    template:
+      - email
+      - movies
+      - movies-720p
+      - filters
+      - usenet
+      - usenet-movies
+
+
+  dl-movies-imdb-1080p: # {{{2
     priority: 120
     template:
       - email
       - movies
+      - movies-imdb
+      - movies-1080p
       - filters
       - usenet
       - usenet-movies
-    quality: 1080p webdl+ h264+
-    content_size:
-      min:  3000
-      max: 15000
-      strict: yes
 
 
-  dl-movies-720p: # {{{2
+  dl-movies-imdb-720p: # {{{2
     priority: 130
     template:
       - email
       - movies
+      - movies-imdb
+      - movies-720p
       - filters
       - usenet
       - usenet-movies
-    quality: 720p+ webdl+ h264+
-    delay: 14 days
-    content_size:
-      min:  1000
-      max: 10000
-      strict: yes
 
 
-  move-tv: # {{{2
+  move-series: # {{{2
+    manual: yes
+    template:
+      - trakt-add-collection
     seen: local
     disable:
       - retry_failed
@@ -240,6 +340,7 @@ tasks: # {{{1
     all_series:
       parse_only: yes
     accept_all: yes
+    require_field: tvdb_series_name
 
     set:
       destination: '/mnt/Skaro/Series'
@@ -251,13 +352,13 @@ tasks: # {{{1
       clean_source: 100   # removes dir if < [N] MB
 
     exec: echo "<<<{{folder}}/{{filename}}>>>"
-    email:
-      from: flexget@tardis
-      to: ramsi@localhost
-      template: move
+    digest: move-tasks
 
 
   move-movies: # {{{2
+    manual: yes
+    template:
+      - trakt-add-collection
     seen: local
     disable:
       - retry_failed
@@ -275,7 +376,16 @@ tasks: # {{{1
         - '[Ss]ample'
 
     imdb_lookup: yes
+    if:
+      - movie_name is None:
+          manipulate:
+            - title:
+                extract: '([^/]*)/[^/]*$'
+                from: location
+          imdb_lookup: yes
+
     accept_all: yes
+    require_field: imdb_name
 
     set:
       destination: '/mnt/Skaro/Movies'
@@ -286,18 +396,45 @@ tasks: # {{{1
       clean_source: 100   # removes dir if < [N] MB
 
     exec: echo "<<<{{filename}}>>>"
+    digest: move-tasks
+
+
+  daily-mail: # {{{2
+    manual: yes
+    no_entries_ok: yes
+    emit_digest:
+      list: move-tasks
+    seen: local
+    accept_all: yes
     email:
       from: flexget@tardis
       to: ramsi@localhost
       template: move
 
 
-  seed-tv-db: # {{{2
+  backfill-mail: # {{{2
+    priority: 500
+    manual: yes
+    template:
+      - email
+    no_entries_ok: yes
+    emit_digest:
+      list: backfill
+    seen: local
+    accept_all: yes
+
+
+  seed-trakt-series: # {{{2
     manual: yes
+    seen: local
+    template:
+      - seed-search
+      - trakt-add-collection
 
     find:
-      path: '/mnt/Skaro/Series'
-      regexp: '.*\.(avi|mkv|mp4|webm)$'
+      path:
+        - '/mnt/Skaro/Series'
+      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
       recursive: yes
 
     manipulate:
@@ -315,17 +452,46 @@ tasks: # {{{1
             regexp: '[\(\)\{\}]'
             format: ' '
 
+    metainfo_series: yes
+    thetvdb_lookup: yes
     all_series: yes
     assume_quality: 480p
+    accept_all: yes
+    require_field:
+      - tvdb_id
+
 
+  seed-trakt-movies: # {{{2
+    manual: yes
+    seen: local
+    template:
+      - trakt-add-collection
+    seen: local
+    find:
+      path:
+        - '/mnt/Skaro/Movies'
+      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
+      recursive: yes
+    imdb_lookup: yes
+    accept_all: yes
     require_field:
-      - series_name
+      - imdb_id
 
 
 schedules: # {{{1
+  - tasks: ['daily-mail']
+    schedule:
+      hour: '17'
+      minute: '00'
+
   - tasks: ['dl-*']
     schedule:
       hour: '*'
       minute: '48'
 
+  - tasks: ['backfill-mail']
+    schedule:
+      hour: '*'
+      minute: '48'
+
 # vim: sts=2 ts=2 sw=2 et
index 911ad2cb09b8360af159ec06d02c041714ab9f17..21d2ea605d7bb6f3010886a1424f1375c9466c0f 100644 (file)
@@ -1,6 +1,6 @@
 [user]
        name = Samir Benmendil
-       email = samir.benmendil@gmail.com
+       email = me@rmz.io
 [color]
        branch = auto
        status = auto
@@ -26,3 +26,5 @@
        defaultToUpstream = true
 [mergetool]
        prompt = no
+[rebase]
+       autostash = true
index 025f82b98d750212aadf740af7de228a832bf044..5958775804e8b2a4b0f63589d81e3f863eba36a0 100644 (file)
@@ -1,5 +1,6 @@
 # default
 ytdl
+ytdl-format=[height<=720]
 cache=auto
 cache-default=50000
 cache-initial=100
diff --git a/msmtprc b/msmtprc
index 75b5d98a5a82a5d96e75b64ac73df6cae006052e..e280535def37e096436f1139d293a062a3bccc02 100644 (file)
--- a/msmtprc
+++ b/msmtprc
@@ -9,13 +9,11 @@ host smtp.gmail.com
 port 587
 protocol smtp
 auth on
-from samir.benmendil@gmail.com
 user samir.benmendil@gmail.com
 password
 
 # unimaas inherits from gmail
 account unimaas : gmail
-from s.benmendil@student.maastrichtuniversity.nl
 
 #set default account
 account default : gmail
index 102dd0b377c64f59af1306c2edef7f4f65c0eb6d..bbc3b9e9c5e2b5b15b86049d1b1f85eb9cac988c 100644 (file)
@@ -6,7 +6,6 @@
 color normal      white         default
 
 color status      green         default
-color sidebar     cyan          default
 color indicator   brightwhite   blue
 color tree        blue          default
 color error       brightred     default
@@ -19,7 +18,6 @@ color index       cyan          default ~P
 color index       brightblue    default "~(~N)"
 # new messages + sidebar
 color index       brightyellow  default "~N"
-color sidebar_new brightyellow  default
 # threads containing old messages
 color index       blue          default "~(~O)"
 # old messages
index 83e7b9b06088968cccf1b8efc44081dfa25a7ab0..a5c2bdf09b95e7da6d3890e69c2d772acbc14f55 100644 (file)
@@ -62,14 +62,6 @@ unignore from: to: cc: date: subject: x-clacks-overhead:
 unhdr_order *
 hdr_order from: to: cc: date: subject: x-clacks-overhead:
 
-# sidebar
-set sidebar_width = 14
-set sidebar_visible = no
-set sidebar_delim = '│'
-set sidebar_sort = no
-set sidebar_shortpath = yes
-set sidebar_format = "%B%* %?N?%N?"
-
 # deal with crap
 set mailcap_path = ~/.mutt/mailcap
 auto_view text/html                                     # view html automatically
index 15694926d310704f02a7d486d84fa189f5765373..04abbd04cb0245a12ef4429f83ac9b867def23b6 100644 (file)
@@ -141,7 +141,7 @@ set padding_right false
 # command :get_cumulative_size or typing "dc".  The size is expensive to
 # calculate and will not be updated automatically.  You can choose
 # to update it automatically though by turning on this option:
-#set autoupdate_cumulative_size false
+set autoupdate_cumulative_size false
 
 # Turning this on makes sense for screen readers:
 #set show_cursor false
index 79881ca96881d584eef0c2ffc43d9f9d02f76a88..7cf2654443d9e19bb8865669009ec2ed08a40e76 100644 (file)
@@ -130,12 +130,13 @@ mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"
 #-------------------------------------------
 # Image Viewing:
 #-------------------------------------------
-mime ^image, has eog,    X, flag f = eog -- "$@"
-mime ^image, has sxiv,   X, flag f = sxiv -- "$@"
-mime ^image, has feh,    X, flag f = feh -- "$@"
-mime ^image, has mirage, X, flag f = mirage -- "$@"
-mime ^image, has gimp,   X, flag f = gimp -- "$@"
-ext xcf,                 X, flag f = gimp -- "$@"
+ext svg,     has inkscape, X, flag f = inkscape -- "$@"
+mime ^image, has eog,      X, flag f = eog -- "$@"
+mime ^image, has sxiv,     X, flag f = sxiv -- "$@"
+mime ^image, has feh,      X, flag f = feh -- "$@"
+mime ^image, has mirage,   X, flag f = mirage -- "$@"
+mime ^image, has gimp,     X, flag f = gimp -- "$@"
+ext xcf,     has gimp,     X, flag f = gimp -- "$@"
 
 #-------------------------------------------
 # Documents
index 32d4fa3a572b9571addf8367c806ca496879690a..000fb3066496189c09cbff876bb0f4cf18471bd7 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -3,4 +3,38 @@ set -g utf8 on
 set -g set-titles on
 set -g mouse-utf8 on
 
-new -s weechat -n weechat weechat
+set -g mode-keys vi
+
+bind Escape copy-mode
+unbind p
+bind p paste-buffer
+bind -t vi-copy 'v' begin-selection
+bind -t vi-copy 'y' copy-selection
+bind -t vi-copy 'Space' halfpage-down
+bind -t vi-copy 'Bspace' halfpage-up
+
+# extra commands for interacting with the ICCCM clipboard
+bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
+bind C-v run "tmux set-buffer \"$(xclip -o -sel clipboard)\"; tmux paste-buffer"
+
+# easy-to-remember split pane commands
+bind | split-window -h
+bind - split-window -v
+unbind '"'
+unbind %
+
+# moving between panes with vim movement keys
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# moving between windows with vim movement keys
+bind -r C-h select-window -t :-
+bind -r C-l select-window -t :+
+
+# resize panes with vim movement keys
+bind -r H resize-pane -L 5
+bind -r J resize-pane -D 5
+bind -r K resize-pane -U 5
+bind -r L resize-pane -R 5
index 9ba5826be12f0d6f00b57f9fcc75897ce695c015..9dfce86d9ec7372580cbce1f5f86efd3279375ed 100644 (file)
@@ -7,6 +7,7 @@ augroup END
 
 augroup ft_ros
     autocmd! BufNewFile,BufRead */ros/*.py  setfiletype python.rospy
+    autocmd! BufNewFile,BufRead */ros/*.cfg setfiletype python.roscfg
     autocmd! BufNewFile,BufRead */ros/*.cpp setfiletype cpp.roscpp
     autocmd! BufNewFile,BufRead */ros/*.h   setfiletype cpp.roscpp
     autocmd! BufNewFile,BufRead */ros/*.cfg setfiletype python.roscfg
index 1432ebb6f77f354ddb5ad25cbcd2d5aa9807dd3a..c79df7a4b2c67f37c3426baf75bc008f490105e6 100644 (file)
@@ -4,3 +4,4 @@ setlocal sidescroll=0
 setlocal sidescrolloff=0
 wincmd L
 vertical resize 78
+normal ze
index b18ae811cc5cabf50985e11dc4ed4a0d49066acf..6f0ce752f908a9b5b088b03bba43684a47ce9f48 100644 (file)
@@ -1,33 +1,58 @@
 snippet pkgver "pkgver() function" b
 pkgver() {
-  cd ${1:$pkgname-$pkgver}
-  ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+       cd ${1:$pkgname-$pkgver}
+       ( set -o pipefail
+               git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+               printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+       )
 }
 endsnippet
 
 snippet prep "prepare() function" b
 prepare() {
-  cd ${1:$pkgname-$pkgver}
-  $0
+       cd ${1:$pkgname-$pkgver}
+       $0
 }
 endsnippet
 
 snippet build "build() function" b
 build() {
-  cd ${1:$pkgname-$pkgver}
-  ./configure \
-    --prefix=/usr $2
-  $0
+       cd ${1:$pkgname-$pkgver}
+       ./configure \
+               --prefix=/usr \
+               --libexecdir=/usr/bin \
+               --libdir=/usr/lib \
+               --sysconfdir=/etc \
+               --localstatedir=/var \
+               --disable-static $2
+       make
+       $0
+}
+endsnippet
+
+snippet build32 "Standard lib32 make" b
+build() {
+       export CC="gcc -m32"
+       export CXX="g++ -m32"
+       export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+       cd ${1:$pkgname-$pkgver}
+       ./configure \
+               --prefix=/usr \
+               --libdir=/usr/lib32 \
+               --sysconfdir=/etc \
+               --localstatedir=/var \
+               --disable-static $2
+       make
 }
 endsnippet
 
 snippet pack "package() function" b
 package() {
-  cd ${1:$pkgname-$pkgver}
-  make DESTDIR="$pkgdir" install
-  $0
+       cd ${1:$pkgname-$pkgver}
+       make DESTDIR="$pkgdir" install
+       $0
 }
 endsnippet
+
+# vim:set ft=snippets:
index 1908d71cdab920c182e1a58145571ecb08c0ccff..7b779f62015e1c0f9b3e395153eec147af7d055f 100644 (file)
@@ -168,7 +168,7 @@ snippet AGPL3 "AGPL3 License" b
 ${0}
 endsnippet
 
-snippet GMGPL linking exception "GMGPL linking exception License" b
+snippet GMGPL "GMGPL linking exception License" b
 `!p snip.rv = b`
 `!p snip.rv = i + m` As a special exception, if other files instantiate generics from
 `!p snip.rv = i + m` this unit, or you link this unit with other files to produce an
diff --git a/vim/ultisnips/roscfg.snippets b/vim/ultisnips/roscfg.snippets
new file mode 100644 (file)
index 0000000..4766e2d
--- /dev/null
@@ -0,0 +1,3 @@
+snippet add "Add a new reconfigure parameter" b
+gen.add("${1:Name}", ${2:int_t}, ${3:0}, "${4:$1}", default=${5:None}, min=${6:None}, max=${7:None})
+endsnippet
diff --git a/vim/ultisnips/rospy.snippets b/vim/ultisnips/rospy.snippets
new file mode 100644 (file)
index 0000000..e303186
--- /dev/null
@@ -0,0 +1,19 @@
+snippet debug "Log Debug" b
+rospy.logdebug(${0:"message"})
+endsnippet
+
+snippet info "Log Info" b
+rospy.loginfo(${0:"message"})
+endsnippet
+
+snippet warn "Log Warning" b
+rospy.logwarn(${0:"message"})
+endsnippet
+
+snippet err "Log Error" b
+rospy.logerr(${0:"message"})
+endsnippet
+
+snippet fatal "Log Fatal" b
+rospy.logfatal(${0:"message"})
+endsnippet
index ff10449e6ac55075d7d991191def968cdd6d3ba3..1ea5c21221789818d8dbcbabb818fc19b7608a53 100644 (file)
@@ -26,7 +26,7 @@ function usage ()
 
 # Parse arguments
 declare -a args
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
        opt="\$1"
 
        case $opt in
@@ -36,7 +36,7 @@ while [[ $# > 0 ]]; do
                        echo -e "\n  Option does not exist : $opt\n"
                        usage; exit 1 ;;
 
-               *) args+=($opt); shift ;;
+               *) args+=("$opt"); shift ;;
        esac
 done
 endsnippet
index 3905add6679e51019a9de68c88649a77f46c7e17..65242d4e81512ad2b39f820ca81c6f766ba58660 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -29,6 +29,8 @@ Plugin 'raimondi/delimitmate'
 " Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
+Plugin 'shougo/vimproc.vim'
+Plugin 'shougo/unite.vim'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-endwise'
@@ -63,8 +65,7 @@ Plugin 'justinmk/vim-sneak'
 Plugin 'chrisbra/checkattach'
 Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'
-Plugin 'shougo/vimproc.vim'
-Plugin 'shougo/unite.vim'
+Plugin 'vim-scripts/mediawiki.vim'
 
 " remove entries first
 set runtimepath -=$HOME/.vim
@@ -100,7 +101,7 @@ set showbreak=↪                 " show these chars for wrapped lines
 set lazyredraw                  " don't redraw while executing macros
 
 set list                        " show chars defined in 'listchars'
-set listchars=tab:â\96¸\            " list of strings used for list mode
+set listchars=tab:â\9d­\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode
 augroup trailing
@@ -313,6 +314,8 @@ nmap <Leader># :%s:<C-R>/::gn<CR>
 " center cursor after search and open folds
 nnoremap n nzzzv
 nnoremap N Nzzzv
+nnoremap ^O ^Ozzzv
+nnoremap ^I ^Izzzv
 
 " same when jumping around
 nnoremap g; g;zzzv
@@ -381,10 +384,13 @@ map Q gq
 " break undo sequence before removing word
 inoremap <C-W> <C-G>u<C-W>
 
-nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
-nmap <Leader>B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4<CR>
-nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
-nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
+nnoremap coe :set <C-R>=&expandtab ? 'noexpandtab' : 'expandtab'<CR><CR>
+nnoremap [oe :set expandtab<CR>
+nnoremap ]oe :set noexpandtab<CR>
+
+for idt in range(1,8)
+  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+endfor
 
 " space will toggle current fold in normal mode
 nnoremap <leader><Space> za
@@ -428,7 +434,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
-nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
+nnoremap <silent> <leader>gc :Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
@@ -517,23 +523,44 @@ call unite#custom#profile('default', 'context', {
             \ 'direction': 'botright'
             \ })
 
+nnoremap [unite] <Nop>
+nmap <leader>u [unite]
+
+" unite-grep {{{3
 " seems not respected
 let g:unite_source_grep_max_candidates = 2000
 if executable('ag')
-    " Use ag in unite rec source
-    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end
+nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
 
-nnoremap [unite] <Nop>
-nmap <leader>u [unite]
+" unite-file_rec {{{3
+if executable('ag')
+    " Use ag in unite rec source
+    let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
+
+" unite-buffer {{{3
 call unite#custom#default_action('buffer', 'goto')
 nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>
-nnoremap <silent> [unite]a :<C-u>Unite grep -input=\12\17<CR>
+
+" unite-menu {{{3
+let g:unite_source_menu_menus = {}
+let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
+let g:unite_source_menu_menus.fugitive.command_candidates = {
+            \ 'Gstatus <Leader>gs' : 'Gstatus',
+            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
+            \ 'Glog' : 'Glog',
+            \}
+
+nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
+
+let g:unite_source_history_yank_enable = 1
+nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
 
 " yankring {{{2
 nnoremap <silent> <leader>p :YRShow<cr>
@@ -616,7 +643,7 @@ nmap <leader>ev :call EditConfig('vimrc')<CR>
 nmap <leader>ef :call EditConfig('ftplugin')<CR>
 nmap <leader>es :call EditConfig('syntax')<CR>
 nmap <leader>ei :call EditConfig('indent')<CR>
-nmap <leader>eu :UltiSnipsEdit<CR>
+nmap <leader>eu :UltiSnipsEdit<CR>:lcd %:p:h<CR>
 
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
diff --git a/wakeonlan/gallifrey b/wakeonlan/gallifrey
new file mode 100644 (file)
index 0000000..2fc5ed3
--- /dev/null
@@ -0,0 +1 @@
+F4:6D:04:AD:A1:0F 192.168.1.0/24
diff --git a/wakeonlan/shada b/wakeonlan/shada
new file mode 100644 (file)
index 0000000..ab50032
--- /dev/null
@@ -0,0 +1 @@
+1c:6f:65:3f:48:9a 192.168.1.0/24
index 219578458aa371a85c327502ba99da93a330544a..e351fab9235b76b63535268cebe6e83a4aafaf39 100644 (file)
@@ -14,7 +14,7 @@ xkb_symbols "default" { //{{{1
     key <AE10> { [      parenright,               0 ] };
     key <AE11> { [     bracketleft,       braceleft ] };
     key <AE12> { [    bracketright,      braceright,      dead_tilde,        NoSymbol ] };
-    key <BKSP> { [       BackSpace,       BackSpace ] };
+    key <BKSP> { [       BackSpace,       BackSpace,          Delete,          Delete ] };
 
     // 2nd Row {{{2
     key  <TAB> { [             Tab,    ISO_Left_Tab ] };
@@ -66,7 +66,7 @@ xkb_symbols "default" { //{{{1
     key <LCTL> { [        Control_L ] };
     key <LALT> { [            Alt_L ] };
     key <LWIN> { [          Super_L ] };
-    key <SPCE> { [            space ] };
+    key <SPCE> { [            space, space, Delete, Delete ] };
     key <RWIN> { [          Super_R ] };
     key <RALT> { [ ISO_Level3_Shift ] };
     key <RCTL> { [        Control_R ] };
index 88abc7615a5061181a1561108d0b59be7daf23a4..aebe4a69e7d250ed4629acf4465db87de33e37f4 100644 (file)
@@ -1,2 +1,4 @@
 function info() { vim -c "Vinfo $1" -c "only" }
 compdef _texinfo info=info
+
+alias cdtmp='cd $(mktemp -d)'
index 803ec37cf14223f81a9e033ab363a3ac71edf8ed..7fd00e545280dd461cf3b28db7b92a3c3d51a4cf 100644 (file)
@@ -1,33 +1,59 @@
-# TODO: Explain what some of this does..
+bindkey -v
 
-bindkey -e
-bindkey -s '\el' "ls\n"
-bindkey '\ew'   kill-region
-bindkey '^r'    history-incremental-search-backward
-bindkey "^[[5~" up-line-or-history
-bindkey "^[[6~" down-line-or-history
+bindkey '^N' history-search-forward
+bindkey '^P' history-search-backward
+bindkey ' '  magic-space    # also do history expansion on space
 
-# make search up and down work, so partially type and hit up/down to find relevant stuff
-bindkey '^[[A'  up-line-or-search   # up arrow
-bindkey '^[[B'  down-line-or-search # down arrow
-
-bindkey "^[[H"  beginning-of-line
-bindkey "^[[1~" beginning-of-line
-bindkey "^[OH"  beginning-of-line
-bindkey "\e[7~" beginning-of-line
-bindkey "^[[F"  end-of-line
-bindkey "^[[4~" end-of-line
-bindkey "\e[8~" end-of-line
-bindkey "^[OF"  end-of-line
-bindkey ' '     magic-space    # also do history expansion on space
-
-bindkey "^[[1;5C" forward-word
-bindkey "^[[1;5D" backward-word
+bindkey -s '^[l' '\11ls\r' # show dir content
 
 bindkey '^[[Z' reverse-menu-complete
 
+bindkey -M vicmd 'v' edit-command-line
+
+# delay after ESC (in 0.01s)
+export KEYTIMEOUT=40
+
+# emacs bindings
+bindkey '^A'  beginning-of-line
+bindkey '^B'  backward-char
+bindkey '^E'  end-of-line
+bindkey '^F'  edit-command-line
+bindkey '^G'  list-expand
+bindkey '^O'  accept-line-and-down-history
+bindkey '^Q'  push-input
+bindkey '^?'  backward-delete-char
+bindkey '^H'  backward-delete-char
+bindkey '^W'  backward-kill-word
+bindkey '^X=' what-cursor-position
+bindkey '^[.' insert-last-word
+bindkey '^[?' which-command
+bindkey '^[A' accept-and-hold
+bindkey '^[a' accept-and-hold
+bindkey '^[C' capitalize-word
+bindkey '^[c' capitalize-word
+bindkey '^[H' run-help
+bindkey '^[h' run-help
+bindkey '^[T' transpose-words
+bindkey '^[t' transpose-words
+
+# make search up and down work, so partially type and hit up/down to find relevant stuff
+bindkey '^[[A'  up-line-or-search    # up arrow
+bindkey '^[[B'  down-line-or-search  # down arrow
+bindkey '^[[5~' up-line-or-history   # PgUp
+bindkey '^[[6~' down-line-or-history # PgDown
+
+bindkey '^[OA' up-line-or-history
+bindkey '^[OB' down-line-or-history
+bindkey '^[OC' forward-char
+bindkey '^[OD' backward-char
+bindkey '^[OF' end-of-line
+bindkey '^[OH' beginning-of-line
+
+bindkey '\e[c' forward-word
+bindkey '\e[d' backward-word
+
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
 bindkey '^?'     backward-delete-char
-bindkey "^[[3~"  delete-char
-bindkey "^[3;5~" delete-char
-bindkey "\e[3~"  delete-char
+bindkey '^[[3~'  delete-char
+bindkey '^[3;5~' delete-char
+bindkey '\e[3~'  delete-char
index fdeb0b858003d89fd9c65af9bac50877b1de75ac..6f0b81ff3062166f31451012be720cb6e490bc8b 100755 (executable)
@@ -47,7 +47,7 @@ bindkey '^T' fzf-file-widget
 
 # ALT-C - cd into the selected directory
 fzf-cd-widget() {
-  cd "${$(command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
+  cd "${$(command find -L . -xdev \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
     -o -type d -print 2> /dev/null | sed 1d | cut -b3- | fzf +m):-.}"
   zle reset-prompt
 }
diff --git a/zsh/lib/git.zsh b/zsh/lib/git.zsh
deleted file mode 100644 (file)
index bffd284..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-# get the name of the branch we are on
-function git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
-
-
-# Checks if working tree is dirty
-parse_git_dirty() {
-  if [[ -n $(git status -s 2> /dev/null) ]]; then
-    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
-  else
-    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
-  fi
-}
-
-# get the difference between the local and remote branches
-git_remote_status() {
-    remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
-    if [[ -n ${remote} ]] ; then
-        ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
-        behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
-
-        if [ $ahead -eq 0 ] && [ $behind -gt 0 ]
-        then
-            echo "$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
-        elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
-        then
-            echo "$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
-        elif [ $ahead -gt 0 ] && [ $behind -gt 0 ]
-        then
-            echo "$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
-        fi
-    fi
-}
-
-# Checks if there are commits ahead from remote
-function git_prompt_ahead() {
-  if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
-    echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
-  fi
-}
-
-# Formats prompt string for current git commit short SHA
-function git_prompt_short_sha() {
-  SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
-}
-
-# Formats prompt string for current git commit long SHA
-function git_prompt_long_sha() {
-  SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
-}
-
-# Get the status of the working tree
-git_prompt_status() {
-  INDEX=$(git status --porcelain -b 2> /dev/null)
-  STATUS=""
-  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-  fi
-  echo $STATUS
-}
index 3de8a53d2d77bbb04ae2bd62cb0c9441764c9a18..8667e83af8ffd7a835d4ac763cec8725d0510a48 100644 (file)
@@ -12,4 +12,7 @@ setopt long_list_jobs
 export PAGER="less"
 export LESS="-SR"
 
+# ls colors
+eval $(dircolors $XDG_CONFIG_HOME/dircolors)
+
 export LC_CTYPE=$LANG
diff --git a/zsh/lib/motd.zsh b/zsh/lib/motd.zsh
new file mode 100644 (file)
index 0000000..43e8152
--- /dev/null
@@ -0,0 +1,9 @@
+autoload colors; colors;
+
+msg()
+{
+  print "$fg_bold[white]$1$reset_color\n$2\n"
+}
+
+msg "gc --{fixup,squash} :/commitmsg " "auto constructs a '{fixup,squash}!' commit message for the last commit matching 'commitmsg'"
+msg "git rebase --autosquash         " "{fixup,squash} commits starting with {fixup,squash}!, must be --interactive"
diff --git a/zsh/lib/prompt.zsh b/zsh/lib/prompt.zsh
new file mode 100644 (file)
index 0000000..61f5db8
--- /dev/null
@@ -0,0 +1,116 @@
+# Setup the prompt with pretty colors
+setopt prompt_subst
+autoload colors; colors;
+
+hostcolor=green
+[[ $(hostname) == "tardis" ]]  && hostcolor=red
+
+precmd() {
+  PROMPT='%T %n@%{$fg[$hostcolor]%}%m%(1j. $fg_bold[white]↵%{$fg_bold[red]%}%j.)%{$reset_color%}%-0>..>$(git_prompt_status)%>>
+%(?..%{$fg_bold[white]%}%?)%{$reset_color%}$(vi_prompt_info)%{%(!.$fg[red]❰.$fg[green]❱)%1G%} '
+  RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
+}
+
+vi_prompt_info() {
+  local vicmd="$fg_bold[green]❰$reset_color%1G"
+  local viins="$fg_bold[blue]❱$reset_color%1G"
+  printf '%s' "%{${${KEYMAP/vicmd/$vicmd}/(main|viins)/$viins}%}"
+}
+
+function zle-line-init zle-line-finish zle-keymap-select {
+  zle reset-prompt
+  zle -R
+}
+
+zle -N zle-line-init
+zle -N zle-line-finish
+zle -N zle-keymap-select
+
+# reset zle on resize
+TRAPWINCH() {
+  zle && { zle reset-prompt; zle -R  }
+}
+
+# Get the status of the working tree
+git_prompt_status() {
+  local branch ahead behind 
+  local added deleted modified renamed unmerged untracked dirty
+  # Use porcelain status for easy parsing.
+  local status_cmd="git status --porcelain -b"
+
+  # Get current status.
+  while IFS=$'\n' read line; do
+    if [[ "$line" == \#\#\ * ]]; then
+      [[ "$line" =~ '## ([^.]*)\.\.\.(.*)' ]] && branch=$match[1]
+      [[ "$line" =~ 'ahead ([0-9]+)'  ]]      && ahead=$match[1]
+      [[ "$line" =~ 'behind ([0-9]+)'  ]]     && behind=$match[1]
+    else
+      # Count added, deleted, modified, renamed, unmerged, untracked, dirty.
+      # T (type change) is undocumented, see http://git.io/FnpMGw.
+      # index
+      [[ "$line" == M[\ MTD]\ * ]]      && (( updated++ ))
+      [[ "$line" == [AC][\ MTD]\ * ]]   && (( added++ ))
+      [[ "$line" == D[\ MT]\ * ]]       && (( deleted++ ))
+      [[ "$line" == R[\ MTD]\ * ]]      && (( renamed++ ))
+
+      # work tree
+      [[ "$line" == [\ MARCT]M\ * ]]    && (( modified++ ))
+      [[ "$line" == [\ MARCT]D\ * ]]    && (( deleted_wt++ ))
+      [[ "$line" == \?\?\ * ]]          && (( untracked++ ))
+
+      # morge conflicts
+      [[ "$line" == (AA|DD|U?|?U)\ * ]] && (( unmerged++ ))
+    fi
+  done < <(${(z)status_cmd} 2> /dev/null)
+
+  local git_status=" %{$fg[yellow]%}"
+
+  # Format branch
+  if [[ -n $branch ]]; then
+    git_status+="$branch"
+  else
+    git_status+="$(git rev-parse --short HEAD 2> /dev/null)"
+    [[ $? -ne 0 ]] && return
+  fi
+
+  # Format upstream
+  local upstream_str
+  (( ahead  > 0 )) && upstream_str+="%{$fg[blue]%} >$ahead"
+  (( behind > 0 )) && upstream_str+="%{$fg[blue]%} <$behind"
+  git_status+="$upstream_str"
+
+  # Format stashed
+  stashed=$(git stash list | wc -l)
+  if (( stashed > 0 )) then
+    stashed_str+="%{$fg_bold[cyan]%} ⋎$stashed%{$reset_color%}"
+  fi
+  git_status+="$stashed_str"
+
+  # Format index
+  local index_str
+  (( updated > 0 )) && index_str+="%{$fg[green]%} *$updated"
+  (( added   > 0 )) && index_str+="%{$fg[green]%} +$added"
+  (( deleted > 0 )) && index_str+="%{$fg[green]%} -$deleted"
+  (( renamed > 0 )) && index_str+="%{$fg[green]%} ≈$renamed"
+  git_status+="$index_str"
+
+  # Format working tree
+  local wt_str
+  (( modified   > 0 )) && wt_str+="%{$fg[red]%} *$modified"
+  (( deleted_wt > 0 )) && wt_str+="%{$fg[red]%} -$deleted_wt"
+  (( untracked  > 0 )) && wt_str+="%{$fg[red]%} +$untracked"
+  (( unmerged   > 0 )) && wt_str+="%{$fg[magenta]%} ♒$unmerged"
+  git_status+="$wt_str"
+
+  git_status+="%{$reset_color%}"
+
+  echo $git_status
+}
+
+function print_if_fits() {
+  local zero length
+
+  zero='%([BSUbfksu]|([FB]|){*})'
+  length=${#${(S%%)1//$~zero/}}
+  echo "%-$length(l.$1.)"
+}
diff --git a/zsh/lib/theme-and-appearance.zsh b/zsh/lib/theme-and-appearance.zsh
deleted file mode 100644 (file)
index 4900895..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# ls colors
-autoload colors; colors;
-eval $(dircolors $XDG_CONFIG_HOME/dircolors)
-
-# Enable ls colors
-ls='ls --color=auto'
-
-setopt no_beep
-setopt multios
-
-if [[ x$WINDOW != x ]]
-then
-    SCREEN_NO="%B$WINDOW%b "
-else
-    SCREEN_NO=""
-fi
-
-# Apply theming defaults
-PS1="%n@%m:%~%# "
-
-# git theming default: Variables for theming the git info prompt
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("         # Prefix at the very beginning of the prompt, before the branch name
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"             # At the very end of the prompt
-ZSH_THEME_GIT_PROMPT_DIRTY="*"              # Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is clean
-
-# Setup the prompt with pretty colors
-setopt prompt_subst
diff --git a/zsh/themes/ramsi.zsh-theme b/zsh/themes/ramsi.zsh-theme
deleted file mode 100644 (file)
index 8964a07..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[[ $(hostname) == "tardis" ]]  && hostcolor=red
-[[ $(hostname) == "shada" ]]   && hostcolor=green
-PROMPT='%(?..%{$fg_bold[white]%}[%?])%{$reset_color%}[%D{%k:%M} %n@%{$fg[$hostcolor]%}%m%{$reset_color%}$(git_prompt_info)]%# '
-RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}<"
-ZSH_THEME_GIT_PROMPT_SUFFIX=">%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
-ZSH_THEME_GIT_PROMPT_CLEAN=""