Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Frontend branding stuff #102

Merged
merged 3 commits into from
Dec 17, 2017
Merged

WIP: Frontend branding stuff #102

merged 3 commits into from
Dec 17, 2017

Conversation

mablae
Copy link
Member

@mablae mablae commented Dec 12, 2016 •
edited
Loading

Solves #101 and #40

  • Bootstrap Updated to Default Theme
  • Use new prooph logo
  • Update Datepicker and Use Browser Datetime with MomentJS

Current State:

image

@mablae mablae changed the base branch from master to prooph_v7 December 12, 2016 15:07
@coveralls
Copy link

Coverage Status

Coverage remained the same at 21.331% when pulling a99a526 on mablae:frontend-branding into 4bc4350 on prooph:prooph_v7.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 21.331% when pulling 0737be3 on mablae:frontend-branding into 4bc4350 on prooph:prooph_v7.

prolic
prolic reviewed Dec 15, 2016
View reviewed changes
public/css/style.css

height: 50px;

}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing new line at end of file

@prolic prolic changed the base branch from prooph_v7 to develop December 23, 2016 13:45
@codeliner
Copy link
Member

@mablae any chance to get the last check? ;) Otherwise I'd say we split it and merge your PR as-is. Would like to have the new branding in place. Nice work so far. Thx

@prolic prolic closed this Mar 30, 2017
@prolic prolic changed the base branch from develop to master March 30, 2017 14:19
@prolic prolic reopened this Mar 30, 2017
@mablae mablae force-pushed the frontend-branding branch from 0737be3 to da298ee Compare April 9, 2017 14:20
@prolic
Copy link
Member

prolic commented Nov 9, 2017

@mablae wow, this is now nearly one year old. How fast the time goes by. Any chance we get this finished?

@codeliner
Copy link
Member

I think we can skip the last point. We'll change the UI to a SPA anyway: see prooph/proophessor-do-symfony#6

@prolic prolic merged commit 8f3badd into prooph:master Dec 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prolic prolic prolic left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mablae @coveralls @codeliner @prolic