v1.0.3 merge

soscripted · Apr 5, 2016 · 98e44d7 · 98e44d7
2 parents b7f3a2d + 8c4a476
commit 98e44d7
Show file tree

Hide file tree

Showing 10 changed files with 1,443 additions and 693 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+sox.dialog.new.html
+sox.new.css
diff --git a/sox-dialog.html b/sox-dialog.html
diff --git a/sox.css b/sox.css
@@ -1,49 +1,51 @@
 /* -------- sox settings dialog  ------- */
+
 #sox-settings-dialog {
-    position: fixed;
-    display: none;
-    height: 100%;
+    top: 34px;
+    left: 230px;
+    min-height: calc(100vh - 100px);
     width: 550px;
-    top: 0;
-    left: 0;
-    z-index: 9999;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
-    background-color: #fff;
-    border-right: solid 1px #aaa;
+    display: none;
 }
-#sox-settings-dialog-title {
-    padding: 10px;
-    height: 30px;
+#sox-settings-dialog .modal-content {
+    /* max-height: calc(100vh - 175px); */
+    max-height: none;
+    min-height: inherit;
 }
-#sox-settings-dialog-title a {
+#sox-settings-dialog .header h3 {
+    width: 100%;
+}
+#sox-settings-dialog-version {
     float: right;
-    margin-right: 5px;
-    cursor: pointer;
+    font-size: 14px;
 }
-#sox-settings-dialog-title h3 {
-    display: inline;
+#sox-settings-dialog #search-container {
+    min-height: 0;
+}
+#sox-settings-dialog #search-container .fa-search {
+    position: relative;
+    left: -350px;
+}
+#sox-settings-dialog #search-container #search {
+    width: 350px;
+    border-radius: 6px;
+    text-indent: 20px;
 }
 #sox-settings-dialog-features {
-    height: calc(100vh - 110px);
-    overflow-y: auto;
-    padding: 0 10px 10px 10px;
+    /* padding: 0 10px 10px 10px; */
+    overflow-y: scroll;
+    height: calc(100vh - 250px);
 }
-#sox-settings-dialog-features h3 {
-    margin-top: 10px;
-    padding-bottom: 2px;
-    border-bottom: 1px solid black;
+#sox-settings-dialog-features .modal-content div {
+    margin-bottom: 3px;
 }
-#sox-settings-dialog-close {
-    float: right;
+
+#sox-settings-dialog-features .modal-content label > input {
+    margin-right: 5px;
 }
-#sox-settings-dialog-close a {
-    padding: 3px 6px 2px 6px;
-    font-size: 16px;
-    font-weight: normal;
-    color: #fff !important;
-    background-color: #222;
-    font-family: Arial, Helvetica, sans-serif;
-    line-height: 1;
+
+#sox-settings-dialog-access-tokens-links {
+    display: none;
 }
 #sox-settings-dialog-actions {
     height: 40px;
@@ -64,7 +66,7 @@
     color: #999;
     height: 24px !important;
     min-width: 34px;
- }
+}
 .sox-settings-button:hover {
     color: #999;
 }
@@ -73,6 +75,7 @@
 }
 
 /* -------- sox specific features' CSS ------- */
+
 #sox-scrollToTop {
     position: fixed;
     right: 0;
@@ -85,6 +88,7 @@
 }
 
 /*Main centered divs, SE-style:*/
+
 .sox-centered {
     width: 400px;
     z-index: 1001;
@@ -98,6 +102,7 @@
 }
 
 /*Specifically for quickCommentShortcuts -- the div's too wide! https://github.com/shu8/Stack-Overflow-Optional-Features/issues/36*/
+
 #quickCommentShortcuts.sox-centered {
     width: 75%;
     height: 90%;
@@ -109,10 +114,8 @@
 }
 
 /*standOutDupeCloseMigrated signs */
-.standOutDupeCloseMigrated-duplicate,
-.standOutDupeCloseMigrated-closed,
-.standOutDupeCloseMigrated-migrated,
-.standOutDupeCloseMigrated-onhold {
+
+.standOutDupeCloseMigrated-duplicate, .standOutDupeCloseMigrated-closed, .standOutDupeCloseMigrated-migrated, .standOutDupeCloseMigrated-onhold {
     color: #FFF;
     padding: 2px;
     border-radius: 4px;
@@ -132,29 +135,28 @@
 }
 
 /*metaNewQuestionAlert for the mod diamond */
+
 #new-meta-questions-button {
     cursor: pointer;
     width: 32px;
 }
-
 .new-meta-questions-diamondOn {
-background-position: -218px -86px;
+    background-position: -218px -86px;
 }
 .new-meta-questions-diamondOff {
-background-position: -138px -86px;
+    background-position: -138px -86px;
 }
-
 #new-meta-questions-dialog {
     top: 34px;
-    left: 230px;
+    left: 264px;
     width: 377px;
 }
-#new-meta-questions-dialog-list:empty::after{
+#new-meta-questions-dialog-list:empty::after {
     content: "No new meta questions at this time.";
 }
 
-
 /*addHotText for the 'this question is hot' banner */
+
 .sox-hot {
     float: right;
     -ms-transform: rotate(30deg);
@@ -163,7 +165,9 @@ background-position: -138px -86px;
     font-size: xx-large;
     color: red;
 }
+
 /*quickCommentShortcutsMain: */
+
 .quickCommentShortcutsReminder {
     height: 40%;
     width: 13%;
@@ -177,7 +181,10 @@ background-position: -138px -86px;
 }
 
 /*fixedTopbar */
+
+
 /*Ubuntu CSS by @UnicornsAreVeryVeryYummy - http://stackapps.com/users/33746/unicorns-are-very-very-yummy */
+
 .fixedTopbar-links {
     z-index: 10001;
     line-height: 19.2px;
@@ -211,6 +218,7 @@ li.fixedTopbar-siteLink {
 }
 
 /*Side by Side Editing (SBS, addSBSBtn, startSBS): https://github.com/szego/SE-Answers_scripts/blob/side-by-side/editing-and-toggling/side-by-side-editing.user.js:*/
+
 #sidebar.sbs-on {
     display: none !important;
 }
@@ -270,23 +278,25 @@ li.fixedTopbar-siteLink {
 }
 
 /*linkedPostsInline for the displayed post text; https://github.com/shu8/Stack-Overflow-Optional-Features/issues/48 */
+
 .linkedPostsInline-loaded-body-shub .post-text {
     overflow-wrap: break-word;
     width: 630px;
     padding: 10px;
 }
 
 /*enhancedEditor (enhanced_editor folder)*/
+
 .enhancedEditor-centered {
-    width:40%;
-    z-index:1001;
-    top:190px;
-    left:615.5px;
-    display:inline-block;
-    margin-top:-95.5px;
-    margin-left:-216px;
-    overflow:auto;
-    height:70%;   
+    width: 40%;
+    z-index: 1001;
+    top: 190px;
+    left: 615.5px;
+    display: inline-block;
+    margin-top: -95.5px;
+    margin-left: -216px;
+    overflow: auto;
+    height: 70%;
 }
 .ownURL, .ownImage {
     border-radius: 5px;
@@ -308,7 +318,7 @@ hr.or {
     text-align: center;
 }
 hr.or:after {
-    content:"or...";
+    content: "or...";
     display: inline-block;
     position: relative;
     top: -0.7em;
@@ -324,56 +334,74 @@ hr.or:after {
 .DDG-credit {
     font-size: 0.8em;
 }
-
 #enhancedEditor-aceEditor>#editor {
     position: absolute;
     top: 10%;
     right: 0;
     bottom: 0;
     left: 0;
 }
-
 .enhancedEditor-aceLanguages {
     float: right;
 }
-
 .enhancedEditor-addCode {
-    float:right;
+    float: right;
     margin-right: 5px;
 }
-
-
 .enhancedEditor-toolbar {
     border-left: 1px solid #ccc;
     border-right: 1px solid #ccc;
     padding-right: 147px;
 }
-
 .enhancedEditor-toolbar > span {
     cursor: pointer;
 }
-
 .enhancedEditor-toolbar >span+span {
-    margin-left:2px;
+    margin-left: 2px;
 }
-
 .enhancedEditor-closeDialog {
     float: left;
     margin-right: 10px;
     font-size: 1.2em;
     cursor: pointer;
 }
-
 .enhancedEditor-toolbar.findReplace > input[type='text'] {
     height: 10px;
     width: 25%;
 }
-
 .enhancedEditor-toolbar.findReplace > input[type='button'] {
     width: 10%;
     height: 100%;
 }
-
 .enhancedEditor-asLinkContainer {
     display: block;
-}
+}
+
+/*downvotedPostsEditAlert - for the watch icon*/
+
+.downvotedPostsEditAlert-watchPostForEdits {
+    font-size: 20px;
+    margin-top: 5px;
+}
+
+/*chatEasyAccess - for the links (b elements)*/
+
+.chatEasyAccess b {
+    cursor: pointer;
+}
+.post-tag.favorite-tag-so {
+    border-color: rgba(0, 0, 0, .3);
+    background-color: #ffefc6;
+}
+.post-tag.favorite-tag-su {
+    border-color: rgba(0, 0, 0, .3);
+    background-color: #a1eaff;
+}
+.post-tag.favorite-tag-all {
+    border-color: rgba(0, 0, 0, .3);
+    background-color: #c3dafa;
+}
+.post-tag.favorite-tag-all:before, .post-tag.favorite-tag-su:before, .post-tag.favorite-tag-so:before {
+    border-color: inherit;
+    background-color: inherit;
+}
diff --git a/sox.dialog.html b/sox.dialog.html
@@ -1,14 +1,32 @@
-<div id="sox-settings-dialog">
-    <div id="sox-settings-dialog-title">
-        <h3>Stack Overflow Extras - Settings</h3>
-        <div id="sox-settings-dialog-close"><a title="Close Settings Dialog">×</a></div>
+<div class="topbar-dialog achievements-dialog dno" id="sox-settings-dialog">
+    <div class="header">
+        <h3>sox settings<span id="sox-settings-dialog-version"> v1.0.3dev</span></h3>
+    </div>
+    <div class="header">
+        <h3>search</h3>
+    </div>
+    <div class="modal-content" id="search-container">
+        <input type="text" id="search" placeholder="looking for a specific feature?">
+        <i class="fa fa-search"></i>
+        <a id="search-reset">reset</a>
     </div>
     <div id="sox-settings-dialog-features">
+        <div id="sox-settings-dialog-access-tokens">
+            <div class="header">
+                <h3>access tokens</h3>
+            </div>
+            <div class="modal-content">
+                <p>Access Tokens are required for some features in order to receive a higher allowance for requests to the API.</p>
+                <p>Below are features that require access tokens. Click the links to get the token.</p>
+                <a class="expander-arrow-small-hide" id="toggle-access-token-links"></a>
+                <div id="sox-settings-dialog-access-tokens-links"></div>
+            </div>
+        </div>
     </div>
     <div id="sox-settings-dialog-actions">
         <input id="sox-settings-dialog-save" type="submit" value="Save Changes">
         <a id="sox-settings-dialog-reset">Reset</a>
         <a id="sox-settings-dialog-report" target="_blank" href="https://github.com/soscripted/sox/issues/new">Report Issue</a>
         <a id="sox-settings-dialog-check-toggle"><i class="fa fa-check-square-o"></i></a>
-  </div>
+    </div>
 </div>