Merge pull request #35 from twisterarmy/twisterarmy

Merge from twisterarmy

README.md

@@ -1,20 +1,20 @@
 twister-html
 ============
 
-HTML interface for twister core.  
+HTML interface for twister core.
 
-See git repo [here](https://github.com/twisterarmy/twister-core).  
+See git repo [here](https://github.com/twisterarmy/twister-core).
-Official (currently unmaintained) [version](https://github.com/miguelfreitas/twister-core)  
+Official (currently unmaintained) [version](https://github.com/miguelfreitas/twister-core)
 
-Stable releses available on this [page](https://github.com/twisterarmy/twister-html/releases).  
+Stable releses available on this [page](https://github.com/twisterarmy/twister-html/releases).
 
-To use development version, clone this repo under `~/.twister/html` like this:  
+To use development version, clone this repo under `~/.twister/html` like this:
 
     git clone https://github.com/twisterarmy/twister-html.git ~/.twister/html
 
-If you're on **Mac OS X** — clone to `${HOME}/Library/Application\ Support/Twister/html` instead of `~/.twister/html`  
+If you're on **Mac OS X** — clone to `${HOME}/Library/Application\ Support/Twister/html` instead of `~/.twister/html`
 
-Switch the edition  
+Switch the edition
 -----------------
 
 TA Edition includes official Blaster updates and alternative features. To switch it, use followig commands:
@@ -39,7 +39,7 @@ Contribute
 Feel free to fork and send pull requests!
 
 To make it easier for us to accept your patches, please follow the conventional GitHub workflow
-and keep in mind that your pull requests should have **blaster** branch as both the origin and target.
+and keep in mind that your pull requests should have **twisterarmy** branch as both the origin and target.
 
 1. After forking, clone your repo:
 
@@ -47,46 +47,42 @@ and keep in mind that your pull requests should have **blaster** branch as both
         git clone git@github.com:YOURNICKNAME/twister-html.git ~/.twister/html
         cd ~/.twister/html
 
-2. Switch to 'blaster' branch:
+2. Switch to 'twisterarmy' branch:
 
-        git checkout blaster
+        git checkout twisterarmy
 
-3. CREATE A NEW BRANCH, specific to the fix you're implementing:
+3. CREATE A NEW BRANCH, specific to the branch prefix and fix you're implementing:
 
-        git checkout -b my-awesome-fix
+        git checkout -b twisterarmy_my_awesome_fix
 
 4. Make your changes.
 
 5. Commit and push:
 
-        git commit -m "fix of #12345: bad foobarizer" && git push --set-upstream origin my-awesome-fix
+        git commit -m "fix of #12345: bad foobarizer" && git push --set-upstream origin twisterarmy_my_awesome_fix
 
-6. Now open a pull request from branch 'YOURNICKNAME:my-awesome-fix' to 'twisterarmy:blaster' on GitHub.
+6. Now open a pull request from branch 'YOURNICKNAME:twisterarmy_my_awesome_fix' to 'twisterarmy:twisterarmy' on GitHub.
 
-7. Once the request is accepted, switch back to 'blaster' and track changes in upstream repo:
+7. Once the request is accepted, switch back to 'twisterarmy' and track changes in upstream repo:
 
         git remote add upstream https://github.com/twisterarmy/twister-html.git  # this is one-off setup
-        git fetch upstream && git checkout blaster
+        git fetch upstream && git checkout twisterarmy
-        git merge upstream/blaster  # you should get a fast-forward message here
+        git merge upstream/twisterarmy  # you should get a fast-forward message here
         git push
 
+8. Alternatively, make your contribution into the official project:
 
-7. Alternatively, make your contribution into the official project:
+        https://github.com/miguelfreitas
-
-        git remote add upstream https://github.com/miguelfreitas/twister-html.git  # this is one-off setup
-        git fetch upstream && git checkout blaster
-        git merge upstream/blaster  # you should get a fast-forward message here
-        git push
 
 Translations
 ------------
 
 If you want to add your own translation, edit `interface_localization.js` like this:
 
-1. Fork the repo and create a new branch from 'blaster' one:
+1. Fork the repo and create a new branch from 'twisterarmy' one:
 
         git clone git@github.com:YOURNICKNAME/twister-html.git ~/.twister/html
-        cd ~/.twister/html && git checkout blaster
+        cd ~/.twister/html && git checkout twisterarmy
         git checkout -b Klingon-translation
 
 2. Add your language to the list of available choices. You should use your ISO code here,
@@ -116,7 +112,7 @@ For multi-region languages, if you want to catch them all, use only the first ha
         git commit -m 'Klingon translation'
         git push origin Klingon-translation
 
-6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'miguelfreitas:blaster' or 'miguelfreitas:blaster' on GitHub.
+6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'twisterarmy:twisterarmy' or 'twisterarmy:twisterarmy' on GitHub.
 
-[Community support](https://github.com/twisterarmy/twister-html/issues)  
+[Community support](https://github.com/twisterarmy/twister-html/issues)
-[Official support](https://github.com/miguelfreitas/twister-core/issues)  
+[Official support](https://github.com/miguelfreitas/twister-core/issues)

home.html

@@ -60,6 +60,7 @@
             <a class="dropdown-menu-item groupmessages selectable_theme theme_original theme_calm" href="#">Group Messages</a>
             <a class="dropdown-menu-item" href="https://github.com/twisterarmy/twister-html/issues" target="_blank">Feedback</a>
             <a class="dropdown-menu-item" href="https://twisterarmy.github.io" target="_blank">Project Website</a>
+            <a class="dropdown-menu-item" href="https://twisterarmy.github.io/donate" target="_blank">Donate</a>
           </div>
         </a>
       </li>

network.html

@@ -47,6 +47,7 @@
               <a class="dropdown-menu-item updates-check-client">Check for client's updates</a>
               <a class="dropdown-menu-item" href="https://github.com/twisterarmy/twister-html/issues" target="_blank">Feedback</a>
               <a class="dropdown-menu-item" href="https://twisterarmy.github.io" target="_blank">Project Website</a>
+              <a class="dropdown-menu-item" href="https://twisterarmy.github.io/donate" target="_blank">Donate</a>
            </div>
           </a>
         </li>

theme_nin_night/css/style.css

@@ -1264,6 +1264,7 @@ span.connection-status.connected:before {
 /* line 1, ../sass/_commons.sass */
 * {
   outline: none !important;
+  transition-duration: 0.2s;
 }
 
 /* line 4, ../sass/_commons.sass */
@@ -1770,13 +1771,11 @@ ul.userMenu-search-profiles button:after, ul.userMenu-search-profiles .mini-prof
     background: transparent url("../img/groupmessages.png") no-repeat scroll center center;
     background-size: 24px 24px;
     height: 1em;
+    opacity: 0.65
 }
 
 .mini-profile-indicators .userMenu-groupmessages:hover a:before {
-    content: "";
+    opacity: 1
-    background: transparent url("../img/groupmessages-hover.png") no-repeat scroll center center;
-    background-size: 24px 24px;
-    height: 1em;
 }
 
 /* line 208, ../sass/style.sass */
@@ -2587,7 +2586,7 @@ ol.toptrends-list a:hover {
 
 
 .inline-warn {
-    background-color: #FEFEDF;
+    background-color: #404655;
     padding: 10px;
 }
 
@@ -3230,7 +3229,7 @@ position: relative;
 
 .uri-shortener-modal .uris-list li.highlighted,
 .uri-shortener-modal .uris-list li:hover {
-    background-color: #FEFEDF;
+    background-color: #404655;
 }
 
 .uri-shortener-modal .uris-list .short {