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.

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

Proj me ms 63 contact #80

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ce41ad7
composer - added social media block
msheikh12 Mar 30, 2017
f5429e1
exporting config settings
msheikh12 Mar 30, 2017
41131bb
added view
msheikh12 Apr 2, 2017
0457151
snapshot
msheikh12 Apr 6, 2017
515bc7a
composer - features install
msheikh12 Apr 6, 2017
f109008
composer.lock - features install
msheikh12 Apr 6, 2017
820be18
module - portfolio feature
msheikh12 Apr 6, 2017
d589e5c
Added the views hw
msheikh12 Apr 7, 2017
b4d1751
committing any work
msheikh12 Apr 27, 2017
9537c73
theme - adding cog base theme
msheikh12 Apr 27, 2017
6033e0d
added my theme
msheikh12 May 4, 2017
269e1df
Added css
msheikh12 May 7, 2017
f3198a4
Added config export
msheikh12 May 7, 2017
db93421
Remove unused custom theme
ashabed May 7, 2017
01df01a
Rename custom theme to proj_me_theme
ashabed May 7, 2017
8f31622
Ignore hidden mac files
ashabed May 7, 2017
dd69e40
Updated composer.lock
ashabed May 7, 2017
b5dee48
Renamed customt heme to proj_me_theme
ashabed May 7, 2017
10e7e0d
Added missing webform and admin_toolbar modules to composer.json
ashabed May 7, 2017
0f2b0b6
Updated composer.lock
ashabed May 7, 2017
5398f04
Updated configuration files for team usage
ashabed May 7, 2017
6f793e3
Rename custom subtheme files
ashabed May 7, 2017
1be2146
Added standard profile
ashabed May 7, 2017
c05da81
Remove unnecessary css map file
ashabed May 7, 2017
199fd1b
Added bootstrap sass files
ashabed May 7, 2017
88efe9f
Update bootstrap contrib theme
ashabed May 7, 2017
5cca636
Removed test SASS changes
ashabed May 7, 2017
33f6dc7
Recompiled CSS
ashabed May 7, 2017
936288f
Added theme gitignore
ashabed May 7, 2017
2ee7461
Removed drush/drush from composer.json
msheikh12 May 7, 2017
fe0baf9
Updated composer.lock
msheikh12 May 7, 2017
f2988b2
Finished Task 1 and 2
msheikh12 May 10, 2017
1961ef2
Worked on task 3 - added hero section
msheikh12 May 10, 2017
1ae95d7
MAde changes to background image
msheikh12 May 11, 2017
6cf3ce0
Updated hero section
msheikh12 May 11, 2017
40d7440
Updated hero section - added border
msheikh12 May 11, 2017
0d08be2
Finished cw-preprocess assignment
msheikh12 May 11, 2017
9ae8a30
Added a config export
AliHassan7 May 14, 2017
c49a300
Added additional styling
AliHassan7 May 14, 2017
0fbc61c
Merge pull request #54 from AliHassan7/mohamed-31
ashabed May 14, 2017
4666602
Added modules drupal/panels drupal/bootstrap_layouts drupal/page_manager
ashabed May 14, 2017
cce39c7
Updated composer.lock
ashabed May 14, 2017
7a1e48c
completed
msheikh12 May 15, 2017
0131e52
exported all my config
msheikh12 May 15, 2017
a3d65cc
created twig file that targets all pages
msheikh12 May 16, 2017
abe17bf
Completed task for creating a twif gile that'll target all pages besi…
msheikh12 May 16, 2017
b6a9910
fixed the social media icons
msheikh12 May 16, 2017
8c56046
Config export
AliHassan7 May 17, 2017
d1179bd
Merge pull request #66 from AliHassan7/mohamed-59-ah
ashabed May 17, 2017
5afef8a
Uninstalled devel
AliHassan7 May 17, 2017
5134606
Completed Issue #63
msheikh12 May 18, 2017
69f8ecc
completed issue #49
msheikh12 May 19, 2017
84424a7
added media query
msheikh12 May 19, 2017
59daaa9
Created view and placed it on the homepage
msheikh12 May 25, 2017
18911e6
Configured and styled the About block Issue #51
msheikh12 May 25, 2017
b095ac5
Installed Drupal Console
msheikh12 Jun 1, 2017
4811957
Created custom module using drupal core
msheikh12 Jun 1, 2017
aaf1e56
Fixed issue with php file for hero section and worked on contact page
msheikh12 Jun 6, 2017
9dbe260
worked on the page
msheikh12 Jun 8, 2017
81d8da3
worked on design
msheikh12 Jun 11, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@

# Ignore files generated by PhpStorm
/.idea/

.DS_Store
12 changes: 10 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,16 @@
"drupal-composer/drupal-scaffold": "^2.2",
"cweagans/composer-patches": "~1.0",
"drupal/core": "~8.0",
"drush/drush": "~8.0",
"drupal/console": "~1.0"
"drupal/console": "~1.0",
"drupal/social_media_links": "^2.2",
"drupal/features": "^3.5",
"drupal/cog": "^1.7",
"drupal/bootstrap": "^3.3",
"drupal/webform": "^5.0@beta",
"drupal/admin_toolbar": "^1.19",
"drupal/panels": "^4.1",
"drupal/bootstrap_layouts": "^4.1",
"drupal/page_manager": "^4.0@beta"
},
"require-dev": {
"behat/mink": "~1.7",
Expand Down
Loading