/extremedating/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/extremedating/trunk

« back to all changes in this revision

Viewing changes to css/main.css

  • Committer: Daniel Johansson
  • Date: 2013-04-13 10:21:04 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: maila@danieljohansson.nu-20130413102104-wydio0djm3euckqv
Edited html

Show diffs side-by-side

added added

removed removed

Lines of Context:
css/main.css
1
 
<<<<<<< TREE
2
1
#wrapper                        {width: 1000px; margin: auto; height: 1000px; background-image:url('../img/background.jpg');}
3
 
#profile                        {background-color:#EEE; padding:10px; width: 100%; height: 100%; float: left; overflow:auto;}
4
 
=======
 
2
#profile                        {background-color:#EEE; padding:10px; width: 100%; height: 100%; float: left; }
 
3
#profilename            {font-size: 250%;}
 
4
#profileimg                     {float: left; width: 400px; height: 100%; background-color:#DDD; padding: 20px;}
 
5
 
5
6
/*
6
7
    ExtremeDating - a Hackathon 2013 project.
7
8
    Copyright (C) 2013 Gustav Hartvigsson <gustav.hartvigsson@gmail.com>
21
22
    You should have received a copy of the GNU Affero General Public License
22
23
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
23
24
*/
24
 
 
25
 
 
26
 
#wrapper                        {width: 1000px; margin: auto; height: 1000px; background-image:url('img/background.jpg');}
27
 
#innehall                       {background-color:#EEE; padding:10px; width: 100%; height: 100%; float: left; overflow:auto;}
28
 
#form                           {background-color:#EEE; padding:10px; width: 95%; height: 100%; float: center; overflow:auto;}
29
 
>>>>>>> MERGE-SOURCE