Skip to content

#issue1 - #14

Open
Balintskac wants to merge 5 commits into
masterfrom
#issue1
Open

#issue1#14
Balintskac wants to merge 5 commits into
masterfrom
#issue1

Conversation

@Balintskac

Copy link
Copy Markdown
Collaborator

Skeleton so far.

@Moondancer83

Copy link
Copy Markdown
Member

Please...

  1. merege master into branch
  2. move all content from project.html to src/index.html (overwrite its content)
  3. put css files into src/css folder
  4. remove styles from html file, include css instead
  5. remove unused css rules
  6. try to use bootstrap classes instead of own rules if you can (eg.: align-right)

@Balintskac Balintskac closed this Apr 20, 2016
@Balintskac Balintskac reopened this Apr 20, 2016
@Moondancer83

Copy link
Copy Markdown
Member
  1. Your branch is still conflicting. Please merge master into it!
  2. Never use capital letters in file names except it is by purpose.

@Balintskac

Copy link
Copy Markdown
Collaborator Author

How can i take merge master into it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants