From 705e448e6f4f138ab17b0448486ce39487cac922 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 03:34:13 +0530 Subject: [PATCH 01/36] about section text added --- ungleich_page/locale/de/LC_MESSAGES/django.po | 14 +++++++++- .../ungleich_page/includes/_about.html | 26 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 78921c45..2c432b5f 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-13 02:21+0530\n" +"POT-Creation-Date: 2017-10-26 03:32+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "Glasfaser menu" +msgstr "" + msgid "Toggle navigation" msgstr "Umschalten" @@ -96,6 +99,15 @@ msgstr "" "ungleich startet das Projekt AlpLora, mit dem Tiere via LoRaWAN geortet werden können" +msgid "ungleich starts to give basic computer courses for refugees." +msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an." + +msgid "" +"ungleich starts computer learning club for locals, \"Digitale Building " +"ungleich.\"" +msgstr "" +"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige." + msgid "" "ungleich sells Alplora to an IoT " "startup in canton Zürich." diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 0b8218d9..37fc378a 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -79,6 +79,32 @@ +
  • +
    + +
    +
    +
    +

    2016

    +
    +
    +

    {% trans "ungleich starts to give basic computer courses for refugees." %}

    +
    +
    +
    • +
  • +
    + +
    +
    +
    +

    2017

    +
    +
    +

    {% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}

    +
    +
    +
  • From 07dfd3d67533c6ca72d5d1c45f26d1a60b5cfa5e Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 15:10:10 +0530 Subject: [PATCH 02/36] images changed to something more relatable --- ungleich_page/templates/ungleich_page/includes/_about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 37fc378a..e01b22e3 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -81,7 +81,7 @@
  • - +
    @@ -94,7 +94,7 @@
  • - +
    From 38c0c653dfa28b6636cd49dfe192ddd5d9fee11e Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 25 Nov 2017 02:34:26 +0530 Subject: [PATCH 03/36] image set to background of each slide instead of a common background --- .../static/digitalglarus/css/agency.css | 46 ++++--------------- .../static/digitalglarus/css/agency1.css | 42 +++-------------- .../static/digitalglarus/css/ungleich.css | 6 +-- .../static/ungleich_page/css/agency.css | 39 ++-------------- .../static/ungleich_page/css/ungleich.css | 32 +++++++++---- .../ungleich_page/includes/_header.html | 35 ++++++++------ 6 files changed, 63 insertions(+), 137 deletions(-) diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index f66ce70c..1ce961ba 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -67,7 +67,7 @@ h6 { font-size: 18px; } -@media only screen and (max-width: 400px){ +@media only screen and (max-width: 400px){ h1, h2 { font-size: 20px; } @@ -404,8 +404,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -416,7 +416,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -987,17 +987,6 @@ logo-image { background-color: #a1cfd7; } - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1006,26 +995,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1043,7 +1013,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1143,7 +1113,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ @@ -1231,7 +1201,7 @@ hr { padding-top: 2em; } -.donate { +.donate { font-weight: 600; font-size: 24px; } diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css index 67154295..40507f78 100755 --- a/digitalglarus/static/digitalglarus/css/agency1.css +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -400,8 +400,8 @@ section h3.section-subheading { @media(min-width:768px) { section { padding: 50px 0; - } -} + } +} */ .service-heading { margin: 15px 0; @@ -412,7 +412,7 @@ section h3.section-subheading { .no-padding { padding:0; -} +} .no-gutter > [class*='col-'] { padding-top:0; @@ -983,17 +983,6 @@ logo-image { background-color: #a1cfd7; } - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; @@ -1002,26 +991,7 @@ intro-cap { text-transform: uppercase; color: #FFF; } -intro-headline { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 100px; - color:#fff - background-color: #a1cfd7; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #a1cfd7; -} + .darkened-container { /* Fallback for web browsers that doesn't support RGBa */ background: rgb(0, 0, 0); @@ -1039,7 +1009,7 @@ h6 intro-smallcap { font-size: 14px; line-height: 1.43; height: 86px; /* this is wrong */ - /*color: #484848;*/ + /*color: #484848;*/ } .carousel-indicators li { @@ -1139,7 +1109,7 @@ body { .carousel-control { height: 100%; - + } /* Background images are set within the HTML using inline CSS, not here */ diff --git a/digitalglarus/static/digitalglarus/css/ungleich.css b/digitalglarus/static/digitalglarus/css/ungleich.css index 03a2b47c..8c8cd257 100644 --- a/digitalglarus/static/digitalglarus/css/ungleich.css +++ b/digitalglarus/static/digitalglarus/css/ungleich.css @@ -10,17 +10,13 @@ .intro-cap { font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; - font-size: 26px; + font-size: 24px; font-style: normal; font-weight: 200; text-transform: uppercase; color: #FFF; } -.intro-cap { - font-size: 24px; -} - .intro-smallcap { font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 22px; diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 8e6f4155..0011dbee 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -262,24 +262,16 @@ fieldset[disabled] .btn-xl.active { padding: 10px 0; background-color: #222; } +} - .navbar-default.navbar-shrink .navbar-brand { - font-size: 1.5em; - padding: 8px; - } +.navbar-default .navbar-brand { + padding: 8px; } header { text-align: center; color: #fff; - background-attachment: scroll; - background-image: url(../img/header-bg.jpg); - background-position: center center; - background-repeat: none; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; + background: rgba(0,0,0,0.25); } header .intro-text { @@ -913,29 +905,6 @@ logo-image { background-color: #fed136; } - -intro-cap { - margin-bottom: 25px; - text-transform: uppercase; - font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; - font-size: 24px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #fed136; -} -h6 intro-smallcap { - margin-bottom: 25px; - text-transform: none; - font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-size: 18px; - font-weight: 400; - line-height: 50px; - color:#fff - background-color: #fed136; -} - - .carousel-indicators li.active, .text-carousel .carousel-indicators li.active { width: 15px; height: 15px; diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index fc8a460e..f1f7984e 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -8,18 +8,16 @@ } .intro-cap { + margin-top: 25px; + margin-bottom: 25px; font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; - font-size: 26px; + font-size: 24px; font-style: normal; font-weight: 200; text-transform: uppercase; color: #FFF; } -.intro-cap { - font-size: 24px; -} - .intro-smallcap { font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 22px; @@ -117,12 +115,28 @@ } .header_slider > .carousel { - display: flex; - flex-direction: column; height: 100%; - align-items: stretch; +} + +.header_slider > .carousel .carousel-inner { + height: 100%; } .header_slider > .carousel .item { - padding-top: 150px; + height: 100%; +} + +.header_slider > .carousel .item .container { + padding-top: 25px; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; +} + +.header_slider > .carousel .bg_img { + position: absolute; + top: 0; + z-index: -1; + width: 100%; } \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html index 996b297c..96e5dacd 100644 --- a/ungleich_page/templates/ungleich_page/includes/_header.html +++ b/ungleich_page/templates/ungleich_page/includes/_header.html @@ -1,8 +1,7 @@ -{% load static %} -{% load i18n %} +{% load static i18n %}
    -
    From 07d1a61219ec19ffd03898f5dafc41aec9ede2fe Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 27 Nov 2017 18:57:56 +0530 Subject: [PATCH 10/36] more style fixes --- .../static/ungleich_page/css/ungleich.css | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index b7cecadf..c712ba8a 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -131,6 +131,10 @@ height: 100%; } +.header_slider .carousel-indicators li.active { + background-color: #ffffff; +} + .header_slider .carousel-control .fa { font-size: 2em; position: absolute; @@ -154,22 +158,6 @@ justify-content: flex-end; } -@media (min-width: 768px) { - .header_slider .carousel-control .fa-angle-left { - left: 25px; - } - .header_slider .carousel-control .fa-angle-right { - right: 25px; - } - .header_slider .carousel-control .fa { - font-size: 4em; - } - .header_slider > .carousel .item .container { - overflow: auto; - padding: 100px 50px; - } -} - .header_slider > .carousel .bg_img { position: absolute; top: 0; @@ -182,7 +170,6 @@ } .header_slider .intro-cap { - padding-bottom: 25px; font-weight: bold; text-align: right; } @@ -191,6 +178,19 @@ .header_slider .intro-cap { font-size: 2.25em; } + .header_slider .carousel-control .fa-angle-left { + left: 25px; + } + .header_slider .carousel-control .fa-angle-right { + right: 25px; + } + .header_slider .carousel-control .fa { + font-size: 4em; + } + .header_slider > .carousel .item .container { + overflow: auto; + padding: 100px 50px; + } } @media (min-width: 992px) { From f9488b28f82420c4421ae2844426574c80679810 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 28 Nov 2017 05:46:27 +0530 Subject: [PATCH 11/36] style fixes for mobile --- .../static/ungleich_page/css/agency.css | 16 ++++--- .../static/ungleich_page/css/ungleich.css | 42 +++++++++++++++---- .../ungleich_page/includes/_contact_us.html | 6 +-- .../ungleich_page/includes/_portfolio.html | 3 -- .../ungleich_page/includes/_services.html | 7 +--- 5 files changed, 48 insertions(+), 26 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index e5f66956..c8687625 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -336,6 +336,12 @@ section { padding: 75px 0; } +@media(max-width:767px) { + section { + padding: 50px 0; + } +} + section h2.section-heading { margin-top: 0; margin-bottom: 15px; @@ -425,7 +431,7 @@ section h3.section-subheading { } #portfolio .portfolio-item .portfolio-caption h4 { - margin: 0; + margin: 0 0 20px; text-transform: none; color: #494949; } @@ -669,8 +675,8 @@ section h3.section-subheading { } .team-member h4 { - margin-top: 25px; - margin-bottom: 0; + margin-top: 20px; + margin-bottom: 20px; text-transform: none; } @@ -691,7 +697,7 @@ section#contact { section#contact .section-heading { color: #fff; - font-size: 36px; + font-size: 32px; } section#contact .form-group { @@ -929,8 +935,6 @@ logo-image { } .carousel-indicators li.active, .text-carousel .carousel-indicators li.active { - width: 15px; - height: 15px; border: 0; background-color: #fed136; } diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index c712ba8a..d8c6e8b5 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -20,7 +20,7 @@ .intro-cap { margin-top: 25px; - margin-bottom: 25px; + margin-bottom: 15px; font-family: 'Raleway', 'Helvetica Neue', 'Open Sans Bold', Helvetica, Arial, 'Arial Bold', sans-serif; font-size: 24px; font-style: normal; @@ -88,7 +88,6 @@ #portfolio .portfolio-item .portfolio-caption { height: 250px; overflow: hidden; - paddding: 10px; } .img-client { @@ -117,10 +116,22 @@ #portfolio .portfolio-item .portfolio-caption { height: auto; overflow: hidden; - paddding: 10px; } } +@media (max-width: 767px) { + .portfolio-item .portfolio-caption p, + section h2.section-heading, + section h3.section-subheading, + #portfolio .portfolio-item .portfolio-caption h4 { + text-align: left; + } + section h2.section-heading, + section h3.section-subheading { + padding-left: 15px; + } +} + .header_slider { height: 95vh; } @@ -151,7 +162,7 @@ .header_slider > .carousel .item .container { overflow: auto; - padding: 50px 25px 75px; + padding: 50px 25px 65px; height: 100%; display: flex; flex-direction: column; @@ -170,8 +181,8 @@ } .header_slider .intro-cap { - font-weight: bold; text-align: right; + line-height: 1.1; } @media (min-width: 768px) { @@ -189,7 +200,7 @@ } .header_slider > .carousel .item .container { overflow: auto; - padding: 100px 50px; + padding: 75px 50px; } } @@ -201,7 +212,7 @@ .header_slider .intro_lead { color: #fff; - font-size: 1.75em; + font-size: 1.55em; text-align: right; line-height: 1.4; } @@ -210,12 +221,21 @@ .header_slider .intro_lead { font-size: 1.2em; } + + .header_slider .carousel-indicators li { + margin: 1px 7px; + } + .header_slider .carousel-indicators li.active { + margin: 0 7px; + } } .timeline>li .timeline-panel { display: flex; + flex-direction: column; min-height: 80px; - align-items: center; + align-items: stretch; + justify-content: center; padding-bottom: 15px; } @@ -239,6 +259,12 @@ } @media (min-width: 992px) { + .timeline>li .timeline-panel { + min-height: 150px; + } +} + +@media (min-width: 1200px) { .timeline>li .timeline-panel { min-height: 170px; } diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5d59c757..6078ae4b 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -13,14 +13,12 @@
    {% endfor %}

    {% trans "Contact Us" %}

    -
    - -

    +

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    {% trans "You can contact us at" %}

    - info@ungleich.ch + info@ungleich.ch

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 2d872735..b195ead8 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -12,7 +12,6 @@

    {% trans "Data Center Light" %}

    -

     

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    @@ -20,7 +19,6 @@

    {% trans "Rails Hosting" %}

    -

     

    {% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

    @@ -28,7 +26,6 @@

    {% trans "High Speed Internet" %}

    -

     

    {% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 2c3a8f62..37140629 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -16,8 +16,7 @@

    {% trans "Hosting" %}

    -

     

    -

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    +

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    @@ -26,8 +25,7 @@

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    @@ -36,7 +34,6 @@

    {% trans "Linux System Engineering" %}

    -

     

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    From 3eebed6245fb48b27180ae0a9f208bfd9ada65c6 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 00:55:13 +0530 Subject: [PATCH 12/36] about section heading margin fix --- ungleich_page/static/ungleich_page/css/agency.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index c8687625..eb485f78 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -560,10 +560,6 @@ section h3.section-subheading { color: inherit; } -.timeline .timeline-heading-last h4 { - margin-top: 15px; -} - .timeline .timeline-heading h4.subheading { text-transform: none; } @@ -631,10 +627,6 @@ section h3.section-subheading { line-height: 26px; } - .timeline .timeline-heading-last h4 { - margin-top: 45px; - } - .timeline>li.timeline-inverted>.timeline-panel { padding: 10px 20px 20px; } From 1d3307043e06235709c009a103ce43f0687e1bad Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 01:30:50 +0530 Subject: [PATCH 13/36] mobile text size and alignment fix --- .../static/digitalglarus/css/agency.css | 23 ------ .../static/digitalglarus/css/agency1.css | 23 ------ .../static/ungleich_page/css/agency.css | 82 +++++++++++-------- .../static/ungleich_page/css/ungleich.css | 18 ++-- .../ungleich_page/includes/_contact_us.html | 8 +- .../ungleich_page/includes/_portfolio.html | 12 +-- .../ungleich_page/includes/_services.html | 4 +- 7 files changed, 69 insertions(+), 101 deletions(-) diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index 1ce961ba..4ac531c2 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -964,29 +964,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css index 40507f78..6178630c 100755 --- a/digitalglarus/static/digitalglarus/css/agency1.css +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -960,29 +960,6 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #a1cfd7; -} - .intro-small { font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; font-size: 20px; diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index eb485f78..e5d30bc0 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -345,15 +345,15 @@ section { section h2.section-heading { margin-top: 0; margin-bottom: 15px; - font-size: 24px; + font-size: 18px; color: #494949; } section h3.section-subheading { - margin-bottom: 75px; + margin-bottom: 50px; text-transform: none; font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif; - font-size: 18px; + font-size: 16px; font-weight: 400; color: #494949; line-height: 1.4; @@ -366,6 +366,10 @@ section h3.section-subheading { section h2.section-heading { font-size: 40px; } + section h3.section-subheading { + font-size: 18px; + margin-bottom: 75px; + } } .service-heading { @@ -431,7 +435,7 @@ section h3.section-subheading { } #portfolio .portfolio-item .portfolio-caption h4 { - margin: 0 0 20px; + margin: 0 0 17px; text-transform: none; color: #494949; } @@ -450,7 +454,7 @@ section h3.section-subheading { display: inline-block } -@media(min-width:767px) { +@media(min-width:768px) { #portfolio .portfolio-item { margin: 0 0 30px; } @@ -560,6 +564,10 @@ section h3.section-subheading { color: inherit; } +.timeline .timeline-heading h4 { + margin-bottom: 0; +} + .timeline .timeline-heading h4.subheading { text-transform: none; } @@ -657,7 +665,7 @@ section h3.section-subheading { } .team-member { - margin-bottom: 50px; + margin-bottom: 25px; text-align: center; } @@ -667,11 +675,27 @@ section h3.section-subheading { } .team-member h4 { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 10px; + margin-bottom: 10px; text-transform: none; } +@media(max-width:767px) { + .team-member .team-member-caption p { + line-height: 1.5; + } +} + +@media(min-width:768px) { + .team-member { + margin-bottom: 50px; + } + .team-member h4 { + margin-top: 20px; + margin-bottom: 20px; + } +} + .team-member p { margin-top: 0; } @@ -692,6 +716,15 @@ section#contact .section-heading { font-size: 32px; } +@media(max-width:767px) { + section#contact .section-heading { + font-size: 20px; + } + section#contact .intro-smallcap { + font-size: 18px; + } +} + section#contact .form-group { color:white; margin-bottom: 25px; @@ -903,36 +936,15 @@ section h3.section-comment { color: #494949; } -small-comment { - font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: none; - font-transform: none; - font-size:10px; - font-weight:400; - color: #777 -} - -logo-image { - z-index: 100; - position: absolute; - left: 0; - width: 80px; - height: 80px; - margin-left: 0; - border: 7px solid #f1f1f1; - border-radius: 100%; - text-align: center; - color: #fff; - background-color: #fed136; -} - .carousel-indicators li.active, .text-carousel .carousel-indicators li.active { border: 0; background-color: #fed136; } -@media (min-width: 740px) -.carousel-inner, .text-carousel .carousel-inner { - min-height: 225px; + +@media (min-width: 740px) { + .carousel-inner, .text-carousel .carousel-inner { + min-height: 225px; + } } .carousel-text { @@ -943,4 +955,4 @@ logo-image { lign-heignt: 2px; color : #666; text-align : center; -} +} \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index d8c6e8b5..623060b3 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -120,15 +120,11 @@ } @media (max-width: 767px) { - .portfolio-item .portfolio-caption p, - section h2.section-heading, - section h3.section-subheading, - #portfolio .portfolio-item .portfolio-caption h4 { - text-align: left; - } - section h2.section-heading, - section h3.section-subheading { + .intro-smallcap.sm_left, + .section-heading.sm_left, + .section-subheading.sm_left { padding-left: 15px; + padding-right: 15px; } } @@ -251,6 +247,12 @@ padding-bottom: 0; } +@media (max-width: 767px) { + .sm_left { + text-align: left !important; + } +} + @media (min-width: 768px) and (max-width: 991px) { .timeline>li .timeline-panel { diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 6078ae4b..2a2ef246 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -12,16 +12,16 @@ {{ message }} {% endfor %} -

    {% trans "Contact Us" %}

    -

    +

    {% trans "Contact Us" %}

    +

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    {% trans "You can contact us at" %}

    -

    +

    info@ungleich.ch

    -

    (044) 534-66-22

    +

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index b195ead8..db5ce56e 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -4,27 +4,27 @@
    -

    {% trans "Our Products" %}

    -

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    +

    {% trans "Our Products" %}

    +

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    -
    +

    {% trans "Data Center Light" %}

    -

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    +

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    -
    +

    {% trans "Rails Hosting" %}

    {% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

    -
    +

    {% trans "High Speed Internet" %}

    {% trans "We offer high speed fiber internet in Glarus Süd, Glarus and Glarus Nord. Experience 100 Mbit/s and see how speed can change everything." %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 37140629..55db52f1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -4,8 +4,8 @@
    -

    {% trans "our services" %}

    -

    +

    {% trans "our services" %}

    +

    {% trans "We support our clients in all areas of Unix infrastructure." %}
    {% trans "Our top notch configuration management is refreshingly simple and reliable." %}

    From bb8195bc0a16e82f4194d36b3be7d6afef81369a Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 29 Nov 2017 02:56:31 +0530 Subject: [PATCH 14/36] contact section background, logos width --- .../static/ungleich_page/css/agency.css | 42 +++++++++++++--- .../static/ungleich_page/css/ungleich.css | 22 ++++---- .../ungleich_page/includes/_contact_us.html | 5 +- .../ungleich_page/includes/_portfolio.html | 2 +- .../ungleich_page/includes/_services.html | 2 +- .../ungleich_page/includes/_softwares.html | 50 +++++++++---------- .../ungleich_page/includes/_team.html | 8 +-- 7 files changed, 79 insertions(+), 52 deletions(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index e5d30bc0..cccc1de6 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -13,6 +13,14 @@ body { font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; } +.row-eq-height { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + flex-wrap: wrap; +} + .text-muted { color: #494949; font-family: 'Raleway' , "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -345,7 +353,7 @@ section { section h2.section-heading { margin-top: 0; margin-bottom: 15px; - font-size: 18px; + font-size: 22px; color: #494949; } @@ -705,10 +713,16 @@ aside.clients img { } section#contact { - background-color: #222; - background-image: url(../img/map-image.png); - background-position: center; - background-repeat: no-repeat; + position: relative; + background: rgba(0,0,0,0.75); +} + +section#contact .bg_img { + filter: blur(1px); +} + +section#contact a { + color: #79bcf7; } section#contact .section-heading { @@ -717,8 +731,11 @@ section#contact .section-heading { } @media(max-width:767px) { + aside.clients img { + margin: 20px auto; + } section#contact .section-heading { - font-size: 20px; + font-size: 24px; } section#contact .intro-smallcap { font-size: 18px; @@ -943,7 +960,7 @@ section h3.section-comment { @media (min-width: 740px) { .carousel-inner, .text-carousel .carousel-inner { - min-height: 225px; + min-height: 225px; } } @@ -952,7 +969,16 @@ section h3.section-comment { font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size : 20px; font-weight : 100; - lign-heignt: 2px; color : #666; text-align : center; +} + +@media (max-width: 767px) { + .carousel-text { + height: 220px; + overflow: scroll; + } + .carousel-author { + height: 72px; + } } \ No newline at end of file diff --git a/ungleich_page/static/ungleich_page/css/ungleich.css b/ungleich_page/static/ungleich_page/css/ungleich.css index 623060b3..6a00c584 100644 --- a/ungleich_page/static/ungleich_page/css/ungleich.css +++ b/ungleich_page/static/ungleich_page/css/ungleich.css @@ -165,17 +165,6 @@ justify-content: flex-end; } -.header_slider > .carousel .bg_img { - position: absolute; - top: 0; - left: 0; - z-index: -1; - width: 100%; - height: 100%; - background-size: cover; - background-position: center; -} - .header_slider .intro-cap { text-align: right; line-height: 1.1; @@ -226,6 +215,17 @@ } } +.bg_img { + position: absolute; + top: 0; + left: 0; + z-index: -1; + width: 100%; + height: 100%; + background-size: cover; + background-position: center; +} + .timeline>li .timeline-panel { display: flex; flex-direction: column; diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 2a2ef246..1038f358 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -2,6 +2,7 @@ {% load i18n %}
    +
    @@ -12,13 +13,13 @@ {{ message }}
    {% endfor %} -

    {% trans "Contact Us" %}

    +

    {% trans "Contact Us" %}

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}
    {% trans "You can contact us at" %}

    - info@ungleich.ch + info@ungleich.ch

    (044) 534-66-22

    diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index db5ce56e..7ea376b1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -4,7 +4,7 @@
    -

    {% trans "Our Products" %}

    +

    {% trans "Our Products" %}

    {% blocktrans %}Our products include an innovative datacenter,
    affordable VM hosting, and high speed fiber internet for canton Glarus.{% endblocktrans %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 55db52f1..3f2311f0 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -4,7 +4,7 @@
    -

    {% trans "our services" %}

    +

    {% trans "our services" %}

    {% trans "We support our clients in all areas of Unix infrastructure." %}
    {% trans "Our top notch configuration management is refreshingly simple and reliable." %} diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index b5ece4d8..2af2a3e1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -2,112 +2,112 @@

  • @@ -60,8 +60,10 @@

    {% trans "ungleich introduces HA-Hosting" %}

    {% trans "and introduces affordable 24X7 support." %}

    -

    {% trans "ungleich launches" %} - {% trans "Digital Glarus project" %}

    +

    + {% trans "ungleich launches" %} + {% trans "Digital Glarus project" %} +

    • From 93d706e97da2a310fda00f2b343c94af32b92dcd Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 1 Dec 2017 20:43:55 +0530 Subject: [PATCH 29/36] timleine heading margin bottom fix --- ungleich_page/static/ungleich_page/css/agency.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index 86d41b2d..1a27a4e1 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -573,7 +573,7 @@ section h3.section-subheading { } .timeline .timeline-heading h4 { - margin-bottom: 0; + margin-bottom: 7px; } .timeline .timeline-heading h4.subheading { From b2d6874090026c8727ac9f3290a7de4c2023fe7c Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 1 Dec 2017 21:07:00 +0530 Subject: [PATCH 30/36] softwares image links style to block --- .../ungleich_page/includes/_softwares.html | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index e9aee73e..cbbaeb5f 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -4,44 +4,44 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -49,66 +49,66 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    From 9c8910a1ffa95d4c4176adae21a77a0ba6d9a632 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 1 Dec 2017 23:23:11 +0530 Subject: [PATCH 31/36] row flex removed --- ungleich_page/templates/ungleich_page/includes/_softwares.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html index cbbaeb5f..4b24b13f 100644 --- a/ungleich_page/templates/ungleich_page/includes/_softwares.html +++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html @@ -2,7 +2,7 @@