search

AamAadmiParty / india-standalone-drupal

A drupal based website that currently powers http://aamaadmiparty.org/, the "main" site. It is different from other AAP websites in drupal for primarily large scale email sending capabilities, among many other small things. (This website is a contender for merging with 'regional-domainsite-drupal' reposiroty when the latter is ready)
GNU General Public License v2.0
0 stars 1 forks source link

The donations widget and right side menu styles are broken suddenly #207

Closed sumeetpareek closed 10 years ago

sumeetpareek commented 10 years ago

The donations widget and right side menu styles are broken suddenly. They both have become full length as shown.

screenshot__2014-04-05__001

sumeetpareek commented 10 years ago

This could be because of the changes in _component.scss by both sumeet and kuldeep .. that result in conflict and incorrect merge, as the git logs show.

commit 9474138a1c01ed3016803660f1a43a443644967a
Merge: 6093791 f979c20
Author: Sumeet Pareek <sumeet.pareek@innroaft.com>
Date:   Thu Apr 3 07:19:47 2014 +0000

    Merge branch 'develop' of https://github.com/AamAadmiParty/india-standalone-drupal into temp-release.

    Conflicts:
        sites/all/themes/aap_theme/sass/_components.scss

commit 19f3fad039628c9358e74fb0167ab7263b111e46
Author: tkuldeep <tkuldeep.singh@innoraft.com>
Date:   Thu Apr 3 12:29:00 2014 +0530

    Centered countdown watch..

     reference -> AamAadmiParty/india-standalone-drupal#182

commit 6093791885dcfb8b73053a2dfaf85a53423b7d3e
Author: Sumeet Pareek <sumeet.pareek@innoraft.com>
Date:   Thu Apr 3 07:48:13 2014 +0530

    Minor CSS fix for the donations widget

commit a94f4c40b9e80d93996b1d4111c97e00a6142af1
Author: tkuldeep <tkuldeep.singh@innoraft.com>
Date:   Mon Mar 31 12:57:18 2014 +0530

    Adds style for loksabha countdown.

     reference ->AamAadmiParty/india-standalone-drupal#182

commit fbaac8fb5c1e29a7a41d63349e27bfcf05c78095
Merge: 2bae5d3 e422a92
Author: Sumeet Pareek <sumeet.pareek@innroaft.com>
Date:   Tue Feb 25 06:50:08 2014 +0000

    Merge remote-tracking branch 'origin/sumeet/120-theme-improvements' into temp-release

commit e422a9255894586e8cc787f80bc0001a6c664050
Author: Sumeet Pareek <sumeet.pareek@innoraft.com>
Date:   Mon Feb 24 19:42:09 2014 +0530

    Theme changes as per feedback from Ankur

    references AamAadmiParty/india-standalone-drupal#120

commit ff9ad788956a0837be1de34a31e08d7497b2aa42
Author: Sumeet Pareek <sumeet.pareek@innoraft.com>
Date:   Sun Feb 23 22:42:08 2014 +0530

    Themed page title, donate block and tags

    references AamAadmiParty/india-standalone-drupal#120
sumeetpareek commented 10 years ago

Fixed :-)