website Changeset - 68f5f1fa2cd1 · Conservancy Kallithea

Changeset - 68f5f1fa2cd1

Parent rev.

Child rev.

[Not reviewed]

0 12 0

Ben Sturmfels (bsturmfels) - 2 years ago 2021-11-19 06:02:59
ben@sturm.com.au

Move sub-menus to RHS and re-enable on mobile.

12 files changed with 57 insertions and 73 deletions:

www/conservancy/static/activities/index.html

www/conservancy/static/css/conservancy.css

www/conservancy/templates/base_about.html

www/conservancy/templates/base_blog.html

www/conservancy/templates/base_compliance.html

www/conservancy/templates/base_conservancy.html

www/conservancy/templates/base_learn.html

www/conservancy/templates/base_press.html

www/conservancy/templates/base_projects.html

www/conservancy/templates/base_vizio.html

www/conservancy/templates/frontpage.html

www/conservancy/templates/news/pressrelease_list.html

0 comments (0 inline, 0 general)

www/conservancy/static/activities/index.html

➞

Show inline comments

@@ ... / @@ -13,19 +13,2 @@ @@
     <div id="container">
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
             <h2>Vizio Lawsuit</h2>
             <ul>
             <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
             <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
             <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
             <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
             </ul>
             <h2>Resources for Journalists on Vizio</h2>
             <ul>
             <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
             <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
          </div>
          <div id="mainContent">
@@ ... / @@ -69,7 +52,22 @@ @@
            systemic bias in their efforts to join the FOSS community.<p>
            {% endblock %}
                </div>
          </div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
             <h2>Vizio Lawsuit</h2>
             <ul>
             <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
             <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
             <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
             <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
             </ul>
             <h2>Resources for Journalists on Vizio</h2>
             <ul>
             <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
             <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
          </div>
     </div>
-           {% endblock %}
 {% endblock %}

www/conservancy/static/css/conservancy.css

➞

Show inline comments

@@ ... / @@ -138,3 +138,3 @@ text-decoration: none; color: #557733; @@
   padding: 0.5rem 1rem;
-  margin: 2rem -0.5rem 0;
+  margin: 0 -1rem;
   border-radius: 8px 8px 0 0;
@@ ... / @@ -147,14 +147,2 @@ text-decoration: none; color: #557733; @@
 @media screen and (min-width: 30em) {
   .donate-sidebar {
     margin: 2rem -1rem 0;
+  }
+}
 @media screen and (max-width: 52em) {
   #sidebar {
       display: none;
+  }
+}
 p.footnote {
@@ ... / @@ -342,3 +330,3 @@ body > header { @@
     max-width: 50em;
     margin: 0;
+    margin: 0 0 2rem;
     padding: 0;
@@ ... / @@ -347,6 +335,7 @@ body > header { @@
+}
 #container #sidebar {
   background-color: #e6eae1;
   padding: 1px 0.5rem 0.25rem;
   margin-bottom: 1rem;
   padding: 1px 0.5rem 2rem;
   margin: 1rem -1rem 0;
+}
@@ ... / @@ -358,4 +347,4 @@ body > header { @@
   #container #sidebar {
   flex: 1 0 15em;
     margin-right: 1rem;
     flex: 1 0 15em;
     margin: 1rem 0rem 1rem 2rem;
+  }
@@ ... / @@ -439,2 +428,9 @@ body > header { @@
   overflow: auto;
   margin: 0;
+}
 @media screen and (min-width: 30em) {
   #conservancyfooter {
     margin: 0;
+  }
+}

www/conservancy/templates/base_about.html

➞

Show inline comments

@@ ... / @@ -4,2 +4,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -8,4 +9,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
    </div>

www/conservancy/templates/base_blog.html

➞

Show inline comments

@@ ... / @@ -10,2 +10,3 @@ @@
  <div id="container">
      <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -38,4 +39,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
    </div>

www/conservancy/templates/base_compliance.html

➞

Show inline comments

@@ ... / @@ -13,2 +13,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -39,4 +40,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
     </div>

www/conservancy/templates/base_conservancy.html

➞

Show inline comments

@@ ... / @@ -111,3 +111,3 @@ @@
 {% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal_endtime|subtract:datetime_now %}
-    <div class="fundraiser-top-text ph2 ph3-ns pt2 pb3">
     <div class="fundraiser-top-text ph3 pt2 pb3">
       <div class="mw8 center ph2 ph4-ns">
@@ ... / @@ -159,3 +159,3 @@ @@
-    <div class="mw8 center ph2 ph3-ns">
     <div class="mw8 center ph2 ph3">
       {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
@@ ... / @@ -163,3 +163,3 @@ @@
     <div id="conservancyfooter" class="mt4 pt3 ph3 bg-light-gray">
+    <div id="conservancyfooter" class="mt4-ns pt3 ph3 bg-light-gray">
       <p>Connect with Conservancy on

www/conservancy/templates/base_learn.html

➞

Show inline comments

@@ ... / @@ -4,2 +4,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -14,4 +15,2 @@ @@
    </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
 </div>

www/conservancy/templates/base_press.html

➞

Show inline comments

@@ ... / @@ -13,2 +13,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -25,5 +26,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
     </div>

www/conservancy/templates/base_projects.html

➞

Show inline comments

@@ ... / @@ -3,2 +3,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
@@ ... / @@ -14,4 +15,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
    </div>

www/conservancy/templates/base_vizio.html

➞

Show inline comments

@@ ... / @@ -13,2 +13,3 @@ @@
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="VizioTopBar {% block submenuselection %}{% endblock %}">
@@ ... / @@ -32,4 +33,2 @@ @@
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
     </div>

www/conservancy/templates/frontpage.html

➞

Show inline comments

@@ ... @@
 <div class="mt3 mh2-ns flex-ns">
+<div class="mt3 mh2-ns mb4 flex-ns">
   <div class="w-70-ns mh2">

www/conservancy/templates/news/pressrelease_list.html

➞

Show inline comments

@@ ... / @@ -5,15 +5,2 @@ @@
     <div id="container">
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
          <h2>News Index by Year</h2>
          <ul>
          {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
          </ul>
          <h2>Resources for Journalists</h2>
          <ul>
             <li class="News"><a href="/news/">News</a></li>
             <li class="PressKit"><a href="/press/">Press Kit</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
          </ul>
          </div>
          <div id="mainContent">
@@ ... / @@ -41,5 +28,16 @@ @@
          </div>
  </div>
 <div class="clear"></div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
          <h2>News Index by Year</h2>
          <ul>
          {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
          </ul>
          <h2>Resources for Journalists</h2>
          <ul>
             <li class="News"><a href="/news/">News</a></li>
             <li class="PressKit"><a href="/press/">Press Kit</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
          </ul>
          </div>
  </div>
 {% endblock %}

0 comments (0 inline, 0 general)