Some styling.

vilniusphp · Oct 9, 2015 · 1a98a8e · 1a98a8e
1 parent a80b7fb
commit 1a98a8e
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 85 deletions.
diff --git a/.phrozn/layouts/index.twig b/.phrozn/layouts/index.twig
@@ -34,16 +34,14 @@
         <div><a href="archive.html"><i class="mdi-content-filter-list"></i></a></div>
     </div>
 
-    <div class="friends col-sm-3">
+    <div class="col-sm-4">
         {% include 'layouts/widgets/important.twig' %}
-    </div>
-    <div class="col-sm-3">
         {% include 'layouts/widgets/friends.twig' %}
     </div>
-    <div class="sponsors col-sm-3">
+    <div class="sponsors col-sm-4">
         {% include 'layouts/widgets/sponsors.twig' %}
     </div>
-    <div class="social-widget col-sm-3">
+    <div class="social-widget col-sm-4">
         {% include 'layouts/widgets/social-widgets.twig' %}
     </div>
 </div>

diff --git a/.phrozn/layouts/widgets/important.twig b/.phrozn/layouts/widgets/important.twig
@@ -1,15 +1,6 @@
-<div class="panel panel-default">
-    <div class="panel-heading">Bendruomenę globoja</div>
-    <div class="panel-body">
-        <ul class="unstyled logos">
-            <li><a href="http://www.baltic-amadeus.lt"><img src="media/img/ba.png" alt="Baltic Amadeus"></a></li>
-        </ul>
-    </div>
-</div>
-
 <div class="panel panel-default">
     <div class="panel-heading">2% Parama</div>
     <div class="panel-body">
         Norėdami paremti Vilnius PHP bendruomenę paskirdami 2% nuo sumokėto GPM, skaitykite <a href="http://usergroups.lt/parama.html">čia</a>.
     </div>
-</div>
+</div>
diff --git a/.phrozn/layouts/widgets/menu.twig b/.phrozn/layouts/widgets/menu.twig
@@ -9,7 +9,7 @@
             </button>
 
             {# Logo #}
-            <img class="logo" alt="VilniusPHP.LT" src="{{ this.design.logo }}">
+            <a href="/"><img class="logo" alt="VilniusPHP.LT" src="{{ this.design.logo }}"></a>
         </div>
 
         {# Top navigation menu #}

diff --git a/.phrozn/layouts/widgets/nextevent.twig b/.phrozn/layouts/widgets/nextevent.twig
@@ -1,5 +1,4 @@
 <h1>{{ entry.events.0.name }}</h1>
-<div class="about">Susitinkam kartą per mėnesį pasidalinti žiniomis ir pakalbėti aktualiomis temomis</div>
 {% if entry.events.0.masterTopic %}
     <div class="master-topic well">
         {{ entry.events.0.masterTopic }}
@@ -44,7 +43,7 @@
         </div>
         {% if this.afterparty %}
             <div class="after-party col-sm-4">
-                <h2>Pratęsimas</h2>
+                <h2>Diskusijos</h2>
                 {% include 'layouts/widgets/date.twig' with{'date': 'Po pranešimų'} %}
                 {% include 'layouts/widgets/address.twig' with{'address': this.afterparty} %}
             </div>
@@ -59,4 +58,4 @@
             </div>
         {% endif %}
     </div>
-</div>
+</div>
diff --git a/.phrozn/layouts/widgets/sponsors.twig b/.phrozn/layouts/widgets/sponsors.twig
@@ -1,27 +1,12 @@
-<div class="panel panel-primary">
+<div class="panel panel-primary sponsors">
     <div class="panel-heading">
-        <h3 class="panel-title" id="sponsors">Bendruomenę remia</h3>
+        <h3 class="panel-title" id="sponsors">Bendruomenės rėmėjai</h3>
     </div>
     <div class="panel-body">
-        <a class="btn" href="http://www.estina.com" title="Estina - web development services" target="_blank"><img src="media/img/estina-logo-black.png" alt="Estina" /></a>
         <a class="btn" href="http://www.nfq.lt" title="NFQ" target="_blank"><img src="media/img/nfq-logo.png" alt="NFQ" /></a>
-        <a class="btn" href="http://www.visma.com" title="Visma" target="_blank"><img src="media/img/visma-logo.png" alt="Visma" /></a>
         <a class="btn" href="http://www.buildstuff.lt/" title="Build Stuff" target="_blank"><img src="media/img/buildstuff.png" alt="Build Stuff" /></a>
-    </div>
-    <div class="others hidden panel-body">
-        <a class="btn" href="http://www.adform.lt/" title="Build Stuff" target="_blank"><img src="media/img/adform.png" alt="Build Stuff" /></a>
-        <a class="btn" href="http://www.mailer.lt" title="mailer.lt" target="_blank"><img src="media/img/mailer-logo.jpg" alt="mailer.lt" /></a>
-        <a class="btn" href="http://www.paysera.lt" title="paysera" target="_blank"><img src="media/img/paysera.png" alt="paysera.lt" /></a>
-        <a class="btn" href="http://www.strategicstaff.com" title="Strategic Staff Solitions" target="_blank"><img src="media/img/s3-logo.jpg" alt="mailer.lt" /></a>
-        <a class="btn" href="http://www.pigu.lt" title="Pigu.lt" target="_blank"><img src="media/img/pigu-logo.gif" alt="Pigu.lt" /></a>
-        <a class="btn" href="http://www.startup.lt" title="Startup.lt" target="_blank"><img src="media/img/startuplt.png" alt="Startup.lt" /></a>
-        <a class="btn" href="http://www.practica.lt" title="Practica.lt" target="_blank"><img src="media/img/practica.png" alt="Practica.lt" /></a>
-        <a class="btn" href="http://www.wix.com" title="Wix.com" target="_blank"><img src="media/img/wix.com.png" alt="Wix.com" /></a>
-        <a class="btn" href="https://www.cardinity.lt" title="Cardinity" target="_blank"><img src="media/img/cardinity.png" alt="Cardinity" /></a>
-        <a class="btn" href="http://www.manning.com/"><img src="media/img/manning.jpg" alt="Manning" /></a>
-        <a class="btn" href="http://www.eskimi.com" title="Eskimi" target="_blank"><img src="media/img/eskimi-logo.png" alt="Eskimi" /></a>
-        <a class="btn" href="http://www.jetbrains.com/phpstorm/"><img src="media/img/ug_jetbrains.png" alt="JetBrains PhpStorm" /></a>
-        <a class="btn" href="http://oreilly.com/ug/"><img src="media/img/ug_ad_250_viguy.gif" alt="O'Reilly UG Program" /></a>
-        <a class="btn" href="http://apress.com/"><img src="media/img/ug_apress.png" alt="Apress" /></a>
+        <a class="btn" href="http://www.visma.com" title="Visma" target="_blank"><img src="media/img/visma-logo.png" alt="Visma" /></a>
+        <a class="btn" href="http://www.baltic-amadeus.lt" title="Baltic Amadeus" target="_blank"><img src="media/img/ba.png" alt="Baltic Amadeus"></a>
+        <a class="btn" href="http://www.jetbrains.com/phpstorm/"><img src="media/img/ug_jetbrains.png" alt="JetBrains PhpStorm"></a>
     </div>
 </div>
diff --git a/.phrozn/less/vilniusphp.less b/.phrozn/less/vilniusphp.less
@@ -104,9 +104,9 @@ body .navbar {
         }
       }
     }
-    .event-time-place, .after-party {
-      h2, .lighting-talk .heading {
-        min-height: 1em;
+    .event-time-place, .after-party, .sponsor {
+      h2, h3, .lighting-talk .heading {
+        min-height: 1.5em;
       }
       i {
         position: relative;
@@ -184,7 +184,7 @@ body .navbar {
   .sponsors {
     text-align: center;
     a {
-      display: inline-flex;
+      display: inline-block;
       min-width: 18em;
       min-height: 5em;
       margin: 0;
@@ -342,4 +342,4 @@ body {
     width: 100%;
     height: @footerHeight;
   }
-}
+}
diff --git a/.phrozn/styles/vilniusphp.css b/.phrozn/styles/vilniusphp.css
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ OUTPUT_DIR = public_html
 STATIC_REPO = https://github.com/vilniusphp/vilniusphp.github.io.git
 PHR = vendor/pawka/phrozn/bin/phrozn.php
 
-build: $(OUTPUT_DIR) vendor
+build: $(OUTPUT_DIR) vendor 
 	mkdir -p $(OUTPUT_DIR) && $(PHR) up . $(OUTPUT_DIR)
 
 composer.phar:
@@ -25,3 +25,9 @@ $(OUTPUT_DIR):
 
 deploy: $(OUTPUT_DIR) build
 	bin/deploy.sh $(OUTPUT_DIR)
+
+
+lessc-exists: ; @which lessc > /dev/null
+lessc-check: lessc-exists
+less: lessc-check
+	lessc -x .phrozn/less/vilniusphp.less .phrozn/styles/vilniusphp.css
diff --git a/README.md b/README.md
@@ -7,7 +7,8 @@ Vilniusphp.lt homepage
 Naudojimas
 ----------
 
-Tinklapis naudoja [Phrozn](https://github.com/farazdagi/phrozn) įrankį statinių failų generavimui.
+Tinklapis naudoja [Phrozn](https://github.com/farazdagi/phrozn) įrankį statinių
+failų generavimui.
 
 1. Instaliavimas.
 
@@ -17,10 +18,12 @@ Tinklapis naudoja [Phrozn](https://github.com/farazdagi/phrozn) įrankį statini
     make
     ```
 
-    Makefile parsiųs composer.phar, suintaliuos reikiamas bibliotekas ir sukompiliuos statinius failus į public_html direktoriją.
+    Makefile parsiųs composer.phar, suintaliuos reikiamas bibliotekas ir
+    sukompiliuos statinius failus į public_html direktoriją.
 
 
-2. Pridėti įvykio informaciją į `.phrozn/entries/index.twig`. Įvykis pridedamas failo viršuje YAML formatu.
+2. Pridėti įvykio informaciją į `.phrozn/entries/index.twig`. Įvykis pridedamas
+   failo viršuje YAML formatu.
 
 3. Tai pat seną įvykį reikėtų  perkeltį `.phrozn/archive.twig`. 
 
@@ -31,3 +34,21 @@ Tinklapis naudoja [Phrozn](https://github.com/farazdagi/phrozn) įrankį statini
     ``` sh
     make
     ```
+
+CSS
+---
+
+CSS generacimui naudojamas less. Norėdami pridėti savo stilius, redaguotkite
+`.phrozn/less/vilniusphp.less`.
+
+1. less instaliavimas: 
+
+    ```
+    npm install less -g
+    ```
+
+2. CSS generavimas iš less failų:
+
+    ```sh
+    make less
+    ```