community-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1864344 - in /comdev/reporter.apache.org/trunk/site/wizard: css/wizard.css index.html js/source/drafts.js js/source/unified.js js/wizard.js logo.png
Date Sat, 03 Aug 2019 21:41:19 GMT
Author: humbedooh
Date: Sat Aug  3 21:41:18 2019
New Revision: 1864344

URL: http://svn.apache.org/viewvc?rev=1864344&view=rev
Log:
Rework layout, switch font to get around a chrome issue.
also add a silly logo :)

Added:
    comdev/reporter.apache.org/trunk/site/wizard/logo.png   (with props)
Modified:
    comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css
    comdev/reporter.apache.org/trunk/site/wizard/index.html
    comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js
    comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
    comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js

Modified: comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css?rev=1864344&r1=1864343&r2=1864344&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/css/wizard.css Sat Aug  3 21:41:18 2019
@@ -1,40 +1,43 @@
-#wrapper.unified {
-    width: 1200px;
-    min-height: 630px;
+html, body { height: 100%; width: 100%; margin: 0;}
+
+body {
+ font-family: SelawikRegular, sans-serif;
+}
+#wrapper {
+    width: 95%;
+    min-width: 985px;
+    height: calc(100% - 120px);
+    min-height: 652px;
     margin: 0 auto;
-    /*border: 3px solid #333;*/
+    border: 0.75px solid #333;
+    border-radius: 5px;
+    vertical-align:top;
 }
+
 .wizard-step {
     width: 64px !important;
     height: 64px;
     font-size: 36px !important;
     border-radius: 50%;
-    border: 3px solid #666;
+    border: 2px solid #369;
     display: inline-block;
-    color: #666;
+    color: #369;
     text-align: center;
-    margin-left: 18px;
+    
     margin-top: 0px;
-    padding-top: 3px;
+    padding-top: 4px;
+    text-indent: -0.5px;
     position: relative;
     z-index: 3;
     background: #FFF;
 }
 
 
-.unified .wizard-step {
-  margin-left: -10px;
-}
 
 .wizard-step-wrapper {
-    display: inline-block;
-    color: #333;
-    width: 110px;
-    height: 120px;
-}
-
-.unified .wizard-step-wrapper {
-  height: 96px;
+  height: 108px;
+  width: 128px;
+  margin: 0 auto;
 }
 
 .wizard-step-wrapper:hover > * {
@@ -43,64 +46,41 @@
     border-color: #090 !important;
     
 }
-.wizard-step-wrapper:hover .wizard-step {
-    background-color: #090;
-    color: #EEE !important;
+.wizard-step-wrapper:hover > * {
+    background: #090 !important;
+    color: #FFF !important;
     position: relative;
     z-index: 3;
 }
 
 .wizard-step-text {
-    display: inline-block;
-    width: 110px;
-    height: 40px;
-    font-size: 12px;
-    line-height: 18px;
-    margin-left: 9px;
-    text-align: center;
-    z-index: 4;
-    position: relative;
-}
-
-.unified .wizard-step-text {
-  margin-left: -10px;
-  margin-top: -3px;
+  
+  margin-top: -2px;
   height: 16px;
   border-radius: 5px;
-  border: 2px solid #666;
+  border: 2px solid #369;
   background: #FFF;
   height: 20px;
+  font-size: 12px;
+    line-height: 18px;
+    text-align: center;
+    z-index: 4;
+    position: relative;
 }
 
-.unified .wizard-step-text .done {
- color: #F00;
-}
-
-.wizard-step.active {
+.wizard-step.active,.wizard-step-text.active {
     color: #EEE;
     background: #369;
     border-color: #369;
 }
 
 .wizard-line {
-    border-top: 3px solid #666;
-    width: 48px;
-    display: inline-block;
-    height: 88px;
-    margin-bottom: -40px;
-    margin-left: -14px;
-    margin-right: -32px;
-    z-index: 0;
-    position: relative;
-}
-
-.unified .wizard-line {
     border: none;
-    border-right: 3px solid #666;
+    border-right: 3px solid #369;
     width: 48px;
     display: inline-block;
-    margin-top: -24px;
-    margin-left: 4px;
+    margin-top: -28px;
+    margin-left: -47px;
     height: 48px;
     z-index: 0;
     position: absolute;
@@ -113,45 +93,6 @@
 }
 
 
-
-#unified-steps {
-    width: 120px;
-    border: 1.5px solid #3339;
-    background: #EEE;
-    border-radius: 10px;
-    margin: 10px auto;
-    padding: 10px;
-    height: 600px;
-    text-align: center;
-    display: inline-block;
-    float: left;
-}
-
-#wizard-content {
-    width: 720px;
-    border: 1.5px solid #3339;
-    background: #FFE;
-    border-radius: 10px;
-    margin: 10px auto;
-    padding: 10px;
-    min-height: 480px;
-    font-size: 0.85rem;
-}
-
-.wizard-tip {
-    width: 720px;
-    border: 1.5px solid #3339;
-    background: #FEF;
-    border-radius: 10px;
-    margin: 10px auto;
-    padding: 10px;
-    font-size: 0.85rem;
-}
-
-#step_text {
-    margin-bottom: 10px !important;
-}
-
 .btn-sm {
   padding: 0px 3px 0px 3px !important;
   line-height: 1.25 !important;
@@ -227,44 +168,27 @@
            transition: opacity 0.01s linear !important;
  }
  
- 
-.unified textarea {
- font-family: monospace;
- font-size: 12px;
-}
-
-#unified-editor {
- display: none;
-}
-
-.unified #unified-editor {
-  display: inline-block;
-  width: 560px;
-  height: 620px;
-  float: left;
-  margin: 16px;
-  
-}
 
 #unified-helper {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
   display: inline-block;
-  width: 400px;
-  height: 600px;
-  float: left;
-  margin: 10px;
-  border: 2px solid #666;
-  background: #FFE;
-  border-radius: 10px;
-  font-size: 0.9rem;
-  padding: 4px;
+  width: calc(100% - 680px);
+  min-width: 300px;
+  height: 100%;
+  min-height: 600px;
+  border-left: 1.25px solid #666;
+  background: #F5F5F5;
+  font-size: 0.925rem !important;
+  padding: 8px;
+  margin: 0px;
   overflow-y: auto;
-  font-weight: 380;
-  font-family: roboto, montserrat, sans-serif;
-  line-height: 1.1rem;
+  font-family: SelawikRegular, sans-serif;
+  line-height: 1rem;
 }
 
 #unified-helper ul {
- font-size: 0.8rem;
+ font-size: 0.85rem;
 }
 
 #unified-helper > h5 {
@@ -276,34 +200,56 @@
 }
 
 #unified-reflow {
- width: 540px;
- height: 20px;
- font-size: 11px;
- 
+ width: 100%;
+ height: 24px;
+ font-size: 12px;
+ background: #ED8;
+ visibility: hidden;
+ text-align: center;
+ vertical-align:middle;
+ padding-top: 2px;
 }
 
 
-#unified-report {
- width: 540px;
- height: 570px;
- font-size: 11px;
- white-space: pre;
- 
- overflow-x: auto !important;
+#unified-steps {
+    width: 140px;
+    height: 100%;
+    min-height: 650px;
+    border-right: 1.25px solid #3339;
+    background: #F5F5F5;
+    padding-top: 20px;
+    
+    margin: 0px;
+    text-align: center;
+    display: inline-block;
+    vertical-align:top;
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
 }
 
-.unified #tips {
- display: none !important;
-}
 
-.unified #wizard-content {
- display: none;
+#unified-editor {
+  display: inline-block;
+  width: 540px;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+  border: 1px inset #ECAD;
 }
 
-
-@-moz-document url-prefix() {
-    .unified .wizard-line {
-        margin-left: -106px;
-        margin-top: 50px;
-    }
-}
\ No newline at end of file
+#unified-report {
+ width: 100%;
+ height: calc(100% - 24px);
+ font-size: 11px;
+ white-space: pre-wrap;
+ overflow-wrap: normal;
+ overflow-x: auto;
+ font-family: monospace;
+ font-size: 11px;
+ padding: 4px;
+ margin: 0px;
+ border: none;
+ resize: none;
+ outline: none;
+}

Modified: comdev/reporter.apache.org/trunk/site/wizard/index.html
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/index.html?rev=1864344&r1=1864343&r2=1864344&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/index.html (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/index.html Sat Aug  3 21:41:18 2019
@@ -9,16 +9,12 @@
 <meta property='og:site_name' content='ASF Board Report Wizard'>
 <meta property='og:title' content='ASF Board Report Wizard'>
 <meta property='og:type' content='website'>
-<meta property='og:image' content='https://reporter.apache.org/guide/logo.png'>
-
-<script type="text/javascript">
-let editor_type = 'unified';
-</script>
+<meta property='og:image' content='https://reporter.apache.org/wizard/logo.png'>
 
 <title>ASF Board Report Wizard</title>
-<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">

-<link rel="stylesheet" href="css/wizard.css?newstuff"/>
-<link rel="stylesheet" href="highlighter/highlighter.css?newstuff"/>
+<link rel="stylesheet" media="screen" href="https://fontlibrary.org/face/selawik" type="text/css"/>

+<link rel="stylesheet" href="css/wizard.css?unified-1.0"/>
+<link rel="stylesheet" href="highlighter/highlighter.css?unified-1.0"/>
 <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 </head>
 <body>
@@ -27,19 +23,10 @@ let editor_type = 'unified';
   <div class="loader"></div>
  </div>
  
+   <h2 id="pname" style="text-align: center;">Board Report Wizard</h2>
    <div id="wrapper" style="display: none;" class="unified">
-    <h2 id="pname" style="text-align: center;">Board Report Wizard</h2>
-    <div id="unified-steps">
-     
-     
-     </div>
-    
-    <div id="unified-editor">
-     <div id="unified-reflow"></div>
-     <textarea id="unified-report"></textarea>
-    </div>
-    <div id="unified-helper"></div>
-    
+    <div id="unified-steps"></div><div id="unified-editor"><div id="unified-reflow"></div><textarea
id="unified-report"></textarea></div><div id="unified-helper"></div>
+   </div>
    
    <!-- Modal for notices -->
   <div class="modal fade" id="alert" role="dialog">
@@ -74,8 +61,8 @@ let editor_type = 'unified';
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-<script src="highlighter/highlighter.js?newstuff" type="text/javascript"></script>
-<script src="js/wizard.js?newstuff" type="text/javascript"></script>
+<script src="highlighter/highlighter.js" type="text/javascript"></script>
+<script src="js/wizard.js" type="text/javascript"></script>
 </body>
 </html>
 

Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js?rev=1864344&r1=1864343&r2=1864344&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/drafts.js Sat Aug  3 21:41:18 2019
@@ -2,6 +2,7 @@
 
 let saved_drafts = null;
 let draft_stepper = null;
+let editor_type = 'unified';
 
 function save_draft() {
     js = {

Modified: comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js?rev=1864344&r1=1864343&r2=1864344&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/source/unified.js Sat Aug  3 21:41:18
2019
@@ -26,8 +26,9 @@ function UnifiedEditor_highlight_section
         if (reflower) {
             if (should_reflow(additional_text)) {
                 color = 'red';
+                reflower.style.visibility = 'visible';
                 reflower.innerHTML = "SECTION IS OVERFLOWING 80 CHARACTERS!";
-                let btn = new HTML('button', {class: 'btn btn-success btn-sm'}, "Reflow section");
+                let btn = new HTML('button', {style: {marginLeft: '8px'}, class: 'btn btn-success
btn-sm'}, "Reflow section");
                 btn.addEventListener('click', () => {
                     this.object.value = this.object.value.replace(additional_text, Flow.text(additional_text));
                     $(this.object).prop( {
@@ -38,7 +39,7 @@ function UnifiedEditor_highlight_section
                     });
                 reflower.inject(btn);
             } else {
-                reflower.innerHTML = "";
+                reflower.style.visibility = 'hidden';
             }
         }
         $('#unified-report').highlightWithinTextarea('destroy');

Modified: comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js?rev=1864344&r1=1864343&r2=1864344&view=diff
==============================================================================
--- comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js (original)
+++ comdev/reporter.apache.org/trunk/site/wizard/js/wizard.js Sat Aug  3 21:41:18 2019
@@ -1017,6 +1017,7 @@ function showCalendarPicker(parent, seed
 
 let saved_drafts = null;
 let draft_stepper = null;
+let editor_type = 'unified';
 
 function save_draft() {
     js = {
@@ -2025,8 +2026,9 @@ function UnifiedEditor_highlight_section
         if (reflower) {
             if (should_reflow(additional_text)) {
                 color = 'red';
+                reflower.style.visibility = 'visible';
                 reflower.innerHTML = "SECTION IS OVERFLOWING 80 CHARACTERS!";
-                let btn = new HTML('button', {class: 'btn btn-success btn-sm'}, "Reflow section");
+                let btn = new HTML('button', {style: {marginLeft: '8px'}, class: 'btn btn-success
btn-sm'}, "Reflow section");
                 btn.addEventListener('click', () => {
                     this.object.value = this.object.value.replace(additional_text, Flow.text(additional_text));
                     $(this.object).prop( {
@@ -2037,7 +2039,7 @@ function UnifiedEditor_highlight_section
                     });
                 reflower.inject(btn);
             } else {
-                reflower.innerHTML = "";
+                reflower.style.visibility = 'hidden';
             }
         }
         $('#unified-report').highlightWithinTextarea('destroy');

Added: comdev/reporter.apache.org/trunk/site/wizard/logo.png
URL: http://svn.apache.org/viewvc/comdev/reporter.apache.org/trunk/site/wizard/logo.png?rev=1864344&view=auto
==============================================================================
Binary file - no diff available.

Propchange: comdev/reporter.apache.org/trunk/site/wizard/logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message